summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-04-18 12:06:50 +0200
committerDouwe Maan <douwe@gitlab.com>2015-04-18 12:06:50 +0200
commit80657c818c3219ad15321bae975a6db7745b0f23 (patch)
treeb8c096c50efe433e31fad37a2d9b98857d198532
parenta66953b16bab5ecf874958d1acb3520ed7490559 (diff)
downloadgitlab-ce-80657c818c3219ad15321bae975a6db7745b0f23.tar.gz
Redirect to sign in page after signing out.
-rw-r--r--CHANGELOG1
-rw-r--r--app/controllers/application_controller.rb4
2 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index be96d712439..76ecf771b40 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,7 @@ v 7.11.0 (unreleased)
-
v 7.10.0 (unreleased)
+ - Redirect to sign in page after signing out.
- Allow projects to be imported from Google Code.
- Allow users to be invited by email to join a group or project.
- Don't crash when project repository doesn't exist.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 920a981e7c9..5a63b496fab 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