diff options
| author | Marin Jankovski <marin@gitlab.com> | 2014-07-11 12:24:11 +0200 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2014-07-11 19:53:10 +0200 |
| commit | 07b9d80604f130c5958e24651e73e889c6e43bb7 (patch) | |
| tree | 96b24336593f8220410586133f00886a9976a6ae /app/controllers/application_controller.rb | |
| parent | 55efb2d9f2f3024137cfd28ec0b58c723f044b42 (diff) | |
| download | gitlab-ce-07b9d80604f130c5958e24651e73e889c6e43bb7.tar.gz | |
Use devise stored_location to redirect after signing for both public and private pages.
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 9cc63e5c1b9..d0546a441e1 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -68,7 +68,7 @@ class ApplicationController < ActionController::Base flash[:alert] = "Your account is blocked. Retry when an admin has unblocked it." new_user_session_path else - super + stored_location_for(:redirect) || stored_location_for(resource) || root_path end end |