diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-23 12:38:11 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-23 12:38:11 +0000 |
| commit | d4fb062d97d0e9e2508a54eb7819fb2b6e05f345 (patch) | |
| tree | c4ff2982d583c872e834fee3bd6edb7b88ec01e1 | |
| parent | f9119150ec98a62c27345f8ecef1824de6b24d35 (diff) | |
| parent | 78313410f906b290fc87dac7dcdff6952a1fc426 (diff) | |
| download | gitlab-ce-d4fb062d97d0e9e2508a54eb7819fb2b6e05f345.tar.gz | |
Merge branch 'sign-out-to-sign-in' into 'master'
Redirect to sign in page after signing out.
Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2125.
See merge request !541
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/controllers/application_controller.rb | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 69e575be23d..09601e27359 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,7 @@ v 7.11.0 (unreleased) - Fix clone URL field and X11 Primary selection (Dmitry Medvinsky) - Ignore invalid lines in .gitmodules - Fix "Cannot move project" error message from popping up after a successful transfer (Stan Hu) + - Redirect to sign in page after signing out. - - Add "Reply quoting selected text" shortcut key (`r`) - Fix bug causing `@whatever` inside an issue's first code block to be picked up as a user mention. diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 8ddb424dcfb..cfe2c76265c 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -87,6 +87,10 @@ class ApplicationController < ActionController::Base end end + def after_sign_out_path_for(resource) + new_user_session_path + end + def abilities Ability.abilities end |