diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-01-11 10:35:39 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-01-11 10:35:39 +0000 |
| commit | 1e6e95e5621f65d82919a24a2c19556a5dcd4e81 (patch) | |
| tree | af01f6e79292c97a9b15ebecc34d985a68586aaf /app/assets/javascripts | |
| parent | 2de8fb7bab49c1a5168ee56fc12e1f3ceb0ad1c7 (diff) | |
| parent | 4905360c3fb90e737e454a16855423389368ae7a (diff) | |
| download | gitlab-ce-1e6e95e5621f65d82919a24a2c19556a5dcd4e81.tar.gz | |
Merge branch 'dispatcher-dashboard-activities' into 'master'
Refactor dashboard activities path
See merge request gitlab-org/gitlab-ce!16361
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/dispatcher.js | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/pages/dashboard/activity/index.js | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index 9d9605045fb..9376292ec73 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -340,7 +340,9 @@ import Activities from './activities'; shortcut_handler = new ShortcutsIssuable(true); break; case 'dashboard:activity': - new Activities(); + import('./pages/dashboard/activity') + .then(callDefault) + .catch(fail); break; case 'projects:commit:show': new Diff(); diff --git a/app/assets/javascripts/pages/dashboard/activity/index.js b/app/assets/javascripts/pages/dashboard/activity/index.js new file mode 100644 index 00000000000..95faf1f1e98 --- /dev/null +++ b/app/assets/javascripts/pages/dashboard/activity/index.js @@ -0,0 +1,3 @@ +import Activities from '~/activities'; + +export default () => new Activities(); |