summaryrefslogtreecommitdiff
path: root/app/controllers/root_controller.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-09-08 14:49:20 +0100
committerDouwe Maan <douwe@gitlab.com>2015-09-08 14:49:20 +0100
commit5d785457db3017a17722314a52433543dd925164 (patch)
treea030699b752fcd1f161118be70a9df0f625fa0ef /app/controllers/root_controller.rb
parent260fcd45209b59ace6b3fd6dcca6c32c2c75a8f1 (diff)
downloadgitlab-ce-5d785457db3017a17722314a52433543dd925164.tar.gz
Clean up overlap between dashboard and explore.
- Split up SnippetsController into separate dashboard and explore sections. - Use consistent page titles, header titles and sidebars between dashboard and explore sections when signed in or not.
Diffstat (limited to 'app/controllers/root_controller.rb')
-rw-r--r--app/controllers/root_controller.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/root_controller.rb b/app/controllers/root_controller.rb
index fdfe00dc135..a3aa86de5b4 100644
--- a/app/controllers/root_controller.rb
+++ b/app/controllers/root_controller.rb
@@ -6,10 +6,10 @@
#
# For users who haven't customized the setting, we simply delegate to
# `DashboardController#show`, which is the default.
-class RootController < DashboardController
+class RootController < Dashboard::ProjectsController
before_action :redirect_to_custom_dashboard, only: [:show]
- def show
+ def index
super
end
@@ -20,6 +20,7 @@ class RootController < DashboardController
case current_user.dashboard
when 'stars'
+ flash.keep
redirect_to starred_dashboard_projects_path
else
return