From 65f6a92129272959960c6d395c83f6530dece6de Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 31 Aug 2020 15:44:14 -0400 Subject: [PATCH] REFACTOR: Replace `_.extend` with `Object.assign` --- app/assets/javascripts/admin/components/admin-web-hook-event.js | 2 +- app/assets/javascripts/discourse/app/lib/formatter.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/admin/components/admin-web-hook-event.js b/app/assets/javascripts/admin/components/admin-web-hook-event.js index 79011ce6c5c..49d689d8304 100644 --- a/app/assets/javascripts/admin/components/admin-web-hook-event.js +++ b/app/assets/javascripts/admin/components/admin-web-hook-event.js @@ -75,7 +75,7 @@ export default Component.extend({ const expandDetailsKey = this.expandDetailsRequestKey; if (this.expandDetails !== expandDetailsKey) { - let headers = _.extend( + let headers = Object.assign( { "Request URL": this.get("model.request_url"), "Request method": "POST" diff --git a/app/assets/javascripts/discourse/app/lib/formatter.js b/app/assets/javascripts/discourse/app/lib/formatter.js index 529122cc27b..e91e3fbb1a6 100644 --- a/app/assets/javascripts/discourse/app/lib/formatter.js +++ b/app/assets/javascripts/discourse/app/lib/formatter.js @@ -305,7 +305,7 @@ export function relativeAge(date, options) { } else if (format === "medium-with-ago") { return relativeAgeMedium( date, - _.extend(options, { format: "medium", leaveAgo: true }) + Object.assign(options, { format: "medium", leaveAgo: true }) ); }