diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-03-11 19:58:10 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-03-11 19:58:10 +0000 |
| commit | ee14ac68a5c08566cc4a9afb4a7c6874f440019b (patch) | |
| tree | 615e52cf5fc4457c688358488d203ee907485877 /app/assets | |
| parent | d7b386ce4f2f2e75aae4cdc21bc5072f595d9027 (diff) | |
| parent | 90ffb1c0dbed6f695cedb3b7ded2a1769136f238 (diff) | |
| download | gitlab-ce-ee14ac68a5c08566cc4a9afb4a7c6874f440019b.tar.gz | |
Merge branch 'group-activity-separate-tab' into 'master'
Move group activity feed to separate page for consistency with dashboard
and project pages
Fixes #14161. Part of #13480
See merge request !3157
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/dispatcher.js.coffee | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee index 54b28f2dd8d..ee81fee5868 100644 --- a/app/assets/javascripts/dispatcher.js.coffee +++ b/app/assets/javascripts/dispatcher.js.coffee @@ -74,8 +74,9 @@ class Dispatcher shortcut_handler = new ShortcutsNavigation() new TreeView() if $('#tree-slider').length - when 'groups:show' + when 'groups:activity' new Activities() + when 'groups:show' shortcut_handler = new ShortcutsNavigation() when 'groups:group_members:index' new GroupMembers() |