summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDaniel Gerhardt <code@dgerhardt.net>2015-07-02 17:19:34 +0200
committerDaniel Gerhardt <code@dgerhardt.net>2015-07-03 00:22:20 +0200
commitbee3979a4a9dbb7174b49cceda2059de73e277fe (patch)
tree7ffb3ed057293fa5db4e309d2f66922fb5014941 /app
parenta6a0792e9d2a2ffa6bda06b7e171cd4d61097bca (diff)
downloadgitlab-ce-bee3979a4a9dbb7174b49cceda2059de73e277fe.tar.gz
Fix redirection to home page URL for unauthorized users
Redirection to the home page URL was broken by changing the target for `root_url` from `DashboardController` to `RootController` in 94d3c1433df9380ca83f1f35a540074ff0690410. This regression was introduced in the 7.12.0 release. Fixes #1916.
Diffstat (limited to 'app')
-rw-r--r--app/controllers/application_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index a657d3c54ee..63fc146f1d1 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -56,7 +56,7 @@ class ApplicationController < ActionController::Base
def authenticate_user!(*args)
# If user is not signed-in and tries to access root_path - redirect him to landing page
if current_application_settings.home_page_url.present?
- if current_user.nil? && controller_name == 'dashboard' && action_name == 'show'
+ if current_user.nil? && root_path == request.path
redirect_to current_application_settings.home_page_url and return
end
end