summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorPadilla, Gerald <gpadilla@agssa.net>2017-01-28 20:22:13 -0600
committerPadilla, Gerald <gpadilla@agssa.net>2017-01-30 20:05:04 -0600
commit685d67cc3f9c1e68af5d66c6e792e38e567b3288 (patch)
treeb916500a85ce7db345fee66ee13f19d8908c316a /app/controllers
parentadc0e41f2b0e2a8fa15877246738029666716dc2 (diff)
downloadgitlab-ce-685d67cc3f9c1e68af5d66c6e792e38e567b3288.tar.gz
Remove flash warning from login page
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/root_controller.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/root_controller.rb b/app/controllers/root_controller.rb
index 627be74a38f..db2817fadf6 100644
--- a/app/controllers/root_controller.rb
+++ b/app/controllers/root_controller.rb
@@ -7,6 +7,7 @@
# For users who haven't customized the setting, we simply delegate to
# `DashboardController#show`, which is the default.
class RootController < Dashboard::ProjectsController
+ skip_before_action :authenticate_user!, only: [:index]
before_action :redirect_to_custom_dashboard, only: [:index]
def index
@@ -16,7 +17,7 @@ class RootController < Dashboard::ProjectsController
private
def redirect_to_custom_dashboard
- return unless current_user
+ return redirect_to new_user_session_path unless current_user
case current_user.dashboard
when 'stars'