summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/main.js
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-10-11 07:49:38 +0000
committerPhil Hughes <me@iamphill.com>2017-10-11 07:49:38 +0000
commita6b33275c042253eb6ccfb00eaab62a388a931cf (patch)
tree1b2783cade7ea533536952bb51a753873d62247a /app/assets/javascripts/main.js
parenta30417e5c57b9dbb1851ea070912f8c596a83f47 (diff)
parent6fb19f77e6f31c049101624b001f8f36414e0443 (diff)
downloadgitlab-ce-a6b33275c042253eb6ccfb00eaab62a388a931cf.tar.gz
Merge branch '38869-labels' into 'master'
Use ES6 modules in labels and labels manager See merge request gitlab-org/gitlab-ce!14794
Diffstat (limited to 'app/assets/javascripts/main.js')
-rw-r--r--app/assets/javascripts/main.js2
1 files changed, 0 insertions, 2 deletions
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index 50aa445e9e7..09cf5a2a3cb 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -79,8 +79,6 @@ import './issuable_context';
import './issuable_form';
import './issue';
import './issue_status_select';
-import './label_manager';
-import './labels';
import './labels_select';
import './layout_nav';
import LazyLoader from './lazy_loader';