summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-03-11 19:58:10 +0000
committerRobert Speicher <robert@gitlab.com>2016-03-11 19:58:10 +0000
commitee14ac68a5c08566cc4a9afb4a7c6874f440019b (patch)
tree615e52cf5fc4457c688358488d203ee907485877 /config
parentd7b386ce4f2f2e75aae4cdc21bc5072f595d9027 (diff)
parent90ffb1c0dbed6f695cedb3b7ded2a1769136f238 (diff)
downloadgitlab-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 'config')
-rw-r--r--config/routes.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb
index a918b5bd3f0..869fca03ec4 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -382,7 +382,7 @@ Rails.application.routes.draw do
get :issues
get :merge_requests
get :projects
- get :events
+ get :activity
end
scope module: :groups do