summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2018-01-11 21:14:53 +0000
committerFatih Acet <acetfatih@gmail.com>2018-01-11 21:14:53 +0000
commitb5cde6b62efaa97545ebbd334ab96f616a97d326 (patch)
tree9c13021fcbba2a599b778b1e4b42409d0001521f
parent31b3ccb5d2f74a20f2bd05f9bde554864a3bdd6c (diff)
parentb3ea91a1f60952d614dcfce95c05d2fb6ea2f714 (diff)
downloadgitlab-ce-b5cde6b62efaa97545ebbd334ab96f616a97d326.tar.gz
Merge branch 'dispatcher-dashboard-mr' into 'master'
Refactor dispatcher dashboard mr path See merge request gitlab-org/gitlab-ce!16360
-rw-r--r--app/assets/javascripts/dispatcher.js6
-rw-r--r--app/assets/javascripts/pages/dashboard/merge_requests/index.js7
2 files changed, 10 insertions, 3 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js
index b87cd036a82..f8fedab36a1 100644
--- a/app/assets/javascripts/dispatcher.js
+++ b/app/assets/javascripts/dispatcher.js
@@ -52,7 +52,6 @@ import ZenMode from './zen_mode';
import initSettingsPanels from './settings_panels';
import PerformanceBar from './performance_bar';
import initNotes from './init_notes';
-import initLegacyFilters from './init_legacy_filters';
import initIssuableSidebar from './init_issuable_sidebar';
import initProjectVisibilitySelector from './project_visibility';
import GpgBadges from './gpg_badges';
@@ -192,8 +191,9 @@ import Activities from './activities';
.catch(fail);
break;
case 'dashboard:merge_requests':
- projectSelect();
- initLegacyFilters();
+ import('./pages/dashboard/merge_requests')
+ .then(callDefault)
+ .catch(fail);
break;
case 'groups:issues':
case 'groups:merge_requests':
diff --git a/app/assets/javascripts/pages/dashboard/merge_requests/index.js b/app/assets/javascripts/pages/dashboard/merge_requests/index.js
new file mode 100644
index 00000000000..b7353669e65
--- /dev/null
+++ b/app/assets/javascripts/pages/dashboard/merge_requests/index.js
@@ -0,0 +1,7 @@
+import projectSelect from '~/project_select';
+import initLegacyFilters from '~/init_legacy_filters';
+
+export default () => {
+ projectSelect();
+ initLegacyFilters();
+};