diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-01-10 10:36:14 -0600 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-01-10 10:36:14 -0600 |
| commit | 7ca36dd93aff71f590f97f95072558eba5b24736 (patch) | |
| tree | 78a28f9a5cd03e58458ee71e514b525ef3095d4a | |
| parent | 6e4c4b0def85f45923175b5f1c2c678bc9bcbc4a (diff) | |
| download | gitlab-ce-projects-a-refactor.tar.gz | |
Fix indention and bad conflict mergeprojects-a-refactor
| -rw-r--r-- | app/assets/javascripts/dispatcher.js | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index 8a6b80a205a..60662fe1a1f 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -12,7 +12,6 @@ import notificationsDropdown from './notifications_dropdown'; import groupAvatar from './group_avatar'; import GroupLabelSubscription from './group_label_subscription'; import LineHighlighter from './line_highlighter'; -import CILintEditor from './ci_lint_editor'; import groupsSelect from './groups_select'; import Search from './search'; import initAdmin from './admin'; @@ -371,8 +370,8 @@ import Activities from './activities'; break; case 'projects:activity': import('./pages/projects/activity') - .then(callDefault) - .catch(fail); + .then(callDefault) + .catch(fail); shortcut_handler = true; break; case 'projects:commits:show': @@ -520,14 +519,14 @@ import Activities from './activities'; break; case 'projects:artifacts:browse': import('./pages/projects/artifacts/browse') - .then(callDefault) - .catch(fail); + .then(callDefault) + .catch(fail); shortcut_handler = true; break; case 'projects:artifacts:file': import('./pages/projects/artifacts/file') - .then(callDefault) - .catch(fail); + .then(callDefault) + .catch(fail); shortcut_handler = true; break; case 'help:index': |