From a4665c27e8324a69889ec4312dbe5925dbaec167 Mon Sep 17 00:00:00 2001 From: Martin Brennan Date: Wed, 7 Oct 2020 13:13:38 +1000 Subject: [PATCH] Revert "Import getURL to fix deprecation warnings (#52)" This reverts commit d643cf742e4a46423dd07bb72d532e91346e3855. A previous change was already made in this repo to import getURL, this causes a double import which breaks the build. --- assets/javascripts/discourse/components/query-result.js.es6 | 1 - assets/javascripts/discourse/models/query.js.es6 | 1 - 2 files changed, 2 deletions(-) diff --git a/assets/javascripts/discourse/components/query-result.js.es6 b/assets/javascripts/discourse/components/query-result.js.es6 index ef85563..c8dc39d 100644 --- a/assets/javascripts/discourse/components/query-result.js.es6 +++ b/assets/javascripts/discourse/components/query-result.js.es6 @@ -3,7 +3,6 @@ import { ajax } from "discourse/lib/ajax"; import getURL from "discourse-common/lib/get-url"; import Badge from "discourse/models/badge"; import { default as computed } from "discourse-common/utils/decorators"; -import getURL from "discourse-common/lib/get-url"; function randomIdShort() { return "xxxxxxxx".replace(/[xy]/g, () => { diff --git a/assets/javascripts/discourse/models/query.js.es6 b/assets/javascripts/discourse/models/query.js.es6 index 29eb66b..7380146 100644 --- a/assets/javascripts/discourse/models/query.js.es6 +++ b/assets/javascripts/discourse/models/query.js.es6 @@ -5,7 +5,6 @@ import { } from "discourse-common/utils/decorators"; import getURL from "discourse-common/lib/get-url"; import RestModel from "discourse/models/rest"; -import getURL from "discourse-common/lib/get-url"; const Query = RestModel.extend({ dirty: false,