diff options
| author | Marin Jankovski <marin@gitlab.com> | 2014-07-07 09:32:12 +0200 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2014-07-11 19:53:10 +0200 |
| commit | 55efb2d9f2f3024137cfd28ec0b58c723f044b42 (patch) | |
| tree | 164a77a84c8a98ee1c958a5732c3a18b0e025f04 /app/controllers/application_controller.rb | |
| parent | f3b0cb77fcb379107cdd4f770fdb16381cda1baf (diff) | |
| download | gitlab-ce-55efb2d9f2f3024137cfd28ec0b58c723f044b42.tar.gz | |
Revert "Merge branch 'redirect_after_login' into 'master'"
This reverts commit 5aaa35656edaf309354528e197a54461f584ed21, reversing
changes made to 5b8c1767676b94f58558e6de320965c68b57de42.
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 1feeb601d36..9cc63e5c1b9 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 - @return_to || root_path + super end end |