From 89364f80ed3e0ece5b892a1e29e588d5fd08654f Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jschatz1@gmail.com>
Date: Tue, 19 Dec 2017 09:36:06 -0500
Subject: [PATCH 1/2] Move jQuery GL Dropdown to commons.

---
 app/assets/javascripts/{ => commons}/gl_dropdown.js | 4 ++--
 app/assets/javascripts/commons/jquery.js            | 1 +
 app/assets/javascripts/main.js                      | 1 -
 spec/javascripts/gl_dropdown_spec.js                | 2 +-
 spec/javascripts/labels_issue_sidebar_spec.js       | 2 +-
 spec/javascripts/search_autocomplete_spec.js        | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename app/assets/javascripts/{ => commons}/gl_dropdown.js (99%)

diff --git a/app/assets/javascripts/gl_dropdown.js b/app/assets/javascripts/commons/gl_dropdown.js
similarity index 99%
rename from app/assets/javascripts/gl_dropdown.js
rename to app/assets/javascripts/commons/gl_dropdown.js
index bff87dc3aaff31..87252914d47215 100644
--- a/app/assets/javascripts/gl_dropdown.js
+++ b/app/assets/javascripts/commons/gl_dropdown.js
@@ -2,8 +2,8 @@
 /* global fuzzaldrinPlus */
 import _ from 'underscore';
 import fuzzaldrinPlus from 'fuzzaldrin-plus';
-import { visitUrl } from './lib/utils/url_utility';
-import { isObject } from './lib/utils/type_utility';
+import { visitUrl } from '../lib/utils/url_utility';
+import { isObject } from '../lib/utils/type_utility';
 
 var GitLabDropdown, GitLabDropdownFilter, GitLabDropdownRemote, GitLabDropdownInput;
 
diff --git a/app/assets/javascripts/commons/jquery.js b/app/assets/javascripts/commons/jquery.js
index 358935d8488df0..98023d2de22332 100644
--- a/app/assets/javascripts/commons/jquery.js
+++ b/app/assets/javascripts/commons/jquery.js
@@ -11,3 +11,4 @@ import 'select2/select2';
 
 // EE-only
 import 'vendor/jquery.tablesorter';
+import './gl_dropdown';
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index e90119582398b0..d8adc7bf8f3735 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -40,7 +40,6 @@ import loadAwardsHandler from './awards_handler';
 import bp from './breakpoints';
 import './confirm_danger_modal';
 import Flash, { removeFlashClickListener } from './flash';
-import './gl_dropdown';
 import './gl_field_error';
 import './gl_field_errors';
 import './gl_form';
diff --git a/spec/javascripts/gl_dropdown_spec.js b/spec/javascripts/gl_dropdown_spec.js
index b13d1bf8dffec8..7a7b7ec158efbe 100644
--- a/spec/javascripts/gl_dropdown_spec.js
+++ b/spec/javascripts/gl_dropdown_spec.js
@@ -1,6 +1,6 @@
 /* eslint-disable comma-dangle, no-param-reassign, no-unused-expressions, max-len */
 
-import '~/gl_dropdown';
+import '~/commons/gl_dropdown';
 import '~/lib/utils/common_utils';
 import * as urlUtils from '~/lib/utils/url_utility';
 
diff --git a/spec/javascripts/labels_issue_sidebar_spec.js b/spec/javascripts/labels_issue_sidebar_spec.js
index a197b35f6fb807..10a42d59a2c930 100644
--- a/spec/javascripts/labels_issue_sidebar_spec.js
+++ b/spec/javascripts/labels_issue_sidebar_spec.js
@@ -2,7 +2,7 @@
 import IssuableContext from '~/issuable_context';
 import LabelsSelect from '~/labels_select';
 
-import '~/gl_dropdown';
+import '~/commons/gl_dropdown';
 import 'select2';
 import '~/api';
 import '~/create_label';
diff --git a/spec/javascripts/search_autocomplete_spec.js b/spec/javascripts/search_autocomplete_spec.js
index 206f95abc1a4d3..9ec76dfc0ebac0 100644
--- a/spec/javascripts/search_autocomplete_spec.js
+++ b/spec/javascripts/search_autocomplete_spec.js
@@ -1,6 +1,6 @@
 /* eslint-disable space-before-function-paren, max-len, no-var, one-var, one-var-declaration-per-line, no-unused-expressions, consistent-return, no-param-reassign, default-case, no-return-assign, comma-dangle, object-shorthand, prefer-template, quotes, new-parens, vars-on-top, new-cap, max-len */
 
-import '~/gl_dropdown';
+import '~/commons/gl_dropdown';
 import SearchAutocomplete from '~/search_autocomplete';
 import '~/lib/utils/common_utils';
 import * as urlUtils from '~/lib/utils/url_utility';
-- 
GitLab


From 63e6db597f730151f877a20c190b6bcc105984c4 Mon Sep 17 00:00:00 2001
From: Constance Okoghenun <constanceokoghenun@gmail.com>
Date: Tue, 9 Jan 2018 00:17:21 +0100
Subject: [PATCH 2/2] Removed unnecessary imports

---
 app/assets/javascripts/main.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index 214519e9f59f49..c1aae8fd42444f 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -38,9 +38,6 @@ import loadAwardsHandler from './awards_handler';
 import bp from './breakpoints';
 import './confirm_danger_modal';
 import Flash, { removeFlashClickListener } from './flash';
-import './gl_field_error';
-import './gl_field_errors';
-import './gl_form';
 import initTodoToggle from './header';
 import initImporterStatus from './importer_status';
 import initLayoutNav from './layout_nav';
-- 
GitLab