summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/main.js
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-10-30 11:19:07 +0000
committerFilipa Lacerda <filipa@gitlab.com>2017-10-30 11:19:07 +0000
commit46d8209e8c525ec619693c4e09ace3ef59c64d5f (patch)
tree94d1afe86054f7d52cb743abb52db3532a835681 /app/assets/javascripts/main.js
parent94743e0e8fa80f9dc2f2200f33c7047e859ee12d (diff)
parent6919f6361c3cfa87a38cd7eb391ade70823c9106 (diff)
downloadgitlab-ce-46d8209e8c525ec619693c4e09ace3ef59c64d5f.tar.gz
Merge branch 'master' into 38869-importer_status
* master: (51 commits) Move locked check to a guard-clause Ci::Build tag is a trait instead of an own factory [CE backport] Saved configuration for issue board Use the correct project visibility in system hooks Add changelog more readable changelog Make merge_jid handling less stateful in MergeService Fetch the merged branches at once remove extra whitespace use a delegate for `username` to be more future friendly Merging EE doc into CE add changelog entry Avoid using Rugged in Gitlab::Git::Wiki#preview_slug Cache commits on the repository model Remove groups_select from global namespace & simplifies the code Change default disabled merge request widget message to "Merge is not allowed yet" Semi-linear history merge is now available in CE. Remove repetitive karma spec Improve spec to check hidden component Rename to shouldShowUsername ...
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 94951cfbdfe..fd9d0c335a5 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -41,7 +41,6 @@ import './behaviors/';
import './activities';
import './admin';
import './aside';
-import './autosave';
import loadAwardsHandler from './awards_handler';
import bp from './breakpoints';
import './commits';
@@ -55,7 +54,6 @@ import './gl_dropdown';
import './gl_field_error';
import './gl_field_errors';
import './gl_form';
-import './groups_select';
import './header';
import initImporterStatus from './importer_status';
import './issuable_form';