summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-09-25 17:04:20 -0700
committerStan Hu <stanhu@gmail.com>2015-09-26 08:46:05 -0700
commit0383afc66ab889afc6af02203902d1d515723a96 (patch)
tree671139b4d862fa7c04ec5a1930dd3f8cf22dfefc /app/controllers
parent6d6918105941bcb868b59350f56eb2f76efd7cf5 (diff)
downloadgitlab-ce-0383afc66ab889afc6af02203902d1d515723a96.tar.gz
Add user preference to view project activity and starred project activity as default dashboard
Closes #2662
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/root_controller.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/controllers/root_controller.rb b/app/controllers/root_controller.rb
index 54171ff67c5..ad04c646e1b 100644
--- a/app/controllers/root_controller.rb
+++ b/app/controllers/root_controller.rb
@@ -22,6 +22,10 @@ class RootController < Dashboard::ProjectsController
when 'stars'
flash.keep
redirect_to starred_dashboard_projects_path
+ when 'project_activity'
+ redirect_to activity_dashboard_path
+ when 'starred_project_activity'
+ redirect_to activity_dashboard_path(filter: 'starred')
else
return
end