Merge branch 'dispatcher-dashboard-activities' into 'master'

Refactor dashboard activities path See merge request gitlab-org/gitlab-ce!16361

Merge branch 'dispatcher-dashboard-activities' into 'master'
1e6e95e5 · Filipa Lacerda · 2de8fb7b · 4905360c · 1e6e95e5 · 1e6e95e5
Commit 1e6e95e5 authored Jan 11, 2018 by Filipa Lacerda
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

dispatcher.js app/assets/javascripts/dispatcher.js +3 -1

index.js app/assets/javascripts/pages/dashboard/activity/index.js +3 -0

No files found.
--- 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();

--- a/app/assets/javascripts/pages/dashboard/activity/index.js
+++ b/app/assets/javascripts/pages/dashboard/activity/index.js
+import Activities from '~/activities';
+
+export default () => new Activities();