diff options
| author | Phil Hughes <me@iamphill.com> | 2017-12-11 11:35:57 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-12-11 11:35:57 +0000 |
| commit | a5d2732ce91e24fbb7ea8c9b087ba3c7476edc09 (patch) | |
| tree | 551c1d8a8f1b85f426324519e4a74bf4c71eba88 /app/assets/javascripts/main.js | |
| parent | e4bae9118c79c95d16ab634210907e06278c6854 (diff) | |
| parent | 689bc9ea6db102006b548e6176125157955c7f2b (diff) | |
| download | gitlab-ce-a5d2732ce91e24fbb7ea8c9b087ba3c7476edc09.tar.gz | |
Merge branch 'master' into 'url-utility-es-module'
# Conflicts:
# app/assets/javascripts/issue_show/components/app.vue
Diffstat (limited to 'app/assets/javascripts/main.js')
| -rw-r--r-- | app/assets/javascripts/main.js | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index c08d25144e4..9e4047b6840 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -40,9 +40,6 @@ import './admin'; import './aside'; import loadAwardsHandler from './awards_handler'; import bp from './breakpoints'; -import './commits'; -import './compare'; -import './compare_autocomplete'; import './confirm_danger_modal'; import Flash, { removeFlashClickListener } from './flash'; import './gl_dropdown'; |