From 2a7fb4bf3af31d72f33d614e78a489b028b40b7c Mon Sep 17 00:00:00 2001 From: David Taylor Date: Tue, 5 Jul 2022 15:13:50 +0100 Subject: [PATCH] FIX: Correct error in ip-lookup component definition (#17339) 7caaee2 introduced a duplicate definition of the component JS. This likely happened because we had the template defined under `javascripts/discourse`, and the component JS defined under `javascript/admin`. This commit removes the duplicate definition, and moves the template to the admin addon --- .../app => admin/addon}/templates/components/ip-lookup.hbs | 0 app/assets/javascripts/discourse/app/components/ip-lookup.js | 3 --- 2 files changed, 3 deletions(-) rename app/assets/javascripts/{discourse/app => admin/addon}/templates/components/ip-lookup.hbs (100%) delete mode 100644 app/assets/javascripts/discourse/app/components/ip-lookup.js diff --git a/app/assets/javascripts/discourse/app/templates/components/ip-lookup.hbs b/app/assets/javascripts/admin/addon/templates/components/ip-lookup.hbs similarity index 100% rename from app/assets/javascripts/discourse/app/templates/components/ip-lookup.hbs rename to app/assets/javascripts/admin/addon/templates/components/ip-lookup.hbs diff --git a/app/assets/javascripts/discourse/app/components/ip-lookup.js b/app/assets/javascripts/discourse/app/components/ip-lookup.js deleted file mode 100644 index 87d5ddb040f..00000000000 --- a/app/assets/javascripts/discourse/app/components/ip-lookup.js +++ /dev/null @@ -1,3 +0,0 @@ -import Component from "@ember/component"; - -export default Component.extend({});