diff options
| author | Daniel Gerhardt <code@dgerhardt.net> | 2015-07-02 18:19:34 +0300 |
|---|---|---|
| committer | Daniel Gerhardt <code@dgerhardt.net> | 2015-07-03 01:22:20 +0300 |
| commit | bee3979a4a9dbb7174b49cceda2059de73e277fe (patch) | |
| tree | 7ffb3ed057293fa5db4e309d2f66922fb5014941 | |
| parent | a6a0792e9d2a2ffa6bda06b7e171cd4d61097bca (diff) | |
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.
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/controllers/application_controller.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index ec28ffac92f..65be4bdf16c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 7.13.0 (unreleased) + - Fix redirection to home page URL for unauthorized users (Daniel Gerhardt) - Fix external issue tracker hook/test for HTTPS URLs (Daniel Gerhardt) - Remove link leading to a 404 error in Deploy Keys page (Stan Hu) - Add support for unlocking users in admin settings (Stan Hu) 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 |