summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-01-10 09:42:48 +0000
committerPhil Hughes <me@iamphill.com>2018-01-10 09:42:48 +0000
commit520cb97ee718a338139782ea42ea906c8e82cc9b (patch)
treed616773a80f45edf1aa93479a9ae9a505c7b6bc5
parentb1d013bd9c06f651d1ee2c7458fa389200787fbb (diff)
parent3ead412a5025d8f1bf2978fe35ee2603de3e1ed0 (diff)
downloadgitlab-ce-520cb97ee718a338139782ea42ea906c8e82cc9b.tar.gz
Merge branch 'dispatcher-dashboard-milestone-show' into 'master'
Refactor dashboard milestone show inside dispatcher See merge request gitlab-org/gitlab-ce!16304
-rw-r--r--app/assets/javascripts/dispatcher.js6
-rw-r--r--app/assets/javascripts/pages/dashboard/milestones/show/index.js7
2 files changed, 12 insertions, 1 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js
index f2b1f7c423c..b95615f9355 100644
--- a/app/assets/javascripts/dispatcher.js
+++ b/app/assets/javascripts/dispatcher.js
@@ -196,10 +196,14 @@ import Activities from './activities';
break;
case 'projects:milestones:show':
case 'groups:milestones:show':
- case 'dashboard:milestones:show':
new Milestone();
new Sidebar();
break;
+ case 'dashboard:milestones:show':
+ import('./pages/dashboard/milestones/show')
+ .then(callDefault)
+ .catch(fail);
+ break;
case 'dashboard:issues':
case 'dashboard:merge_requests':
projectSelect();
diff --git a/app/assets/javascripts/pages/dashboard/milestones/show/index.js b/app/assets/javascripts/pages/dashboard/milestones/show/index.js
new file mode 100644
index 00000000000..2e7a08a369c
--- /dev/null
+++ b/app/assets/javascripts/pages/dashboard/milestones/show/index.js
@@ -0,0 +1,7 @@
+import Milestone from '~/milestone';
+import Sidebar from '~/right_sidebar';
+
+export default () => {
+ new Milestone(); // eslint-disable-line no-new
+ new Sidebar(); // eslint-disable-line no-new
+};