Commit d4fb062d authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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
parents f9119150 78313410
...@@ -4,6 +4,7 @@ v 7.11.0 (unreleased) ...@@ -4,6 +4,7 @@ v 7.11.0 (unreleased)
- Fix clone URL field and X11 Primary selection (Dmitry Medvinsky) - Fix clone URL field and X11 Primary selection (Dmitry Medvinsky)
- Ignore invalid lines in .gitmodules - Ignore invalid lines in .gitmodules
- Fix "Cannot move project" error message from popping up after a successful transfer (Stan Hu) - 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`) - 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. - Fix bug causing `@whatever` inside an issue's first code block to be picked up as a user mention.
......
...@@ -87,6 +87,10 @@ class ApplicationController < ActionController::Base ...@@ -87,6 +87,10 @@ class ApplicationController < ActionController::Base
end end
end end
def after_sign_out_path_for(resource)
new_user_session_path
end
def abilities def abilities
Ability.abilities Ability.abilities
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment