summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-04-23 12:38:11 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-04-23 12:38:11 +0000
commitd4fb062d97d0e9e2508a54eb7819fb2b6e05f345 (patch)
treec4ff2982d583c872e834fee3bd6edb7b88ec01e1 /app/controllers
parentf9119150ec98a62c27345f8ecef1824de6b24d35 (diff)
parent78313410f906b290fc87dac7dcdff6952a1fc426 (diff)
downloadgitlab-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
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/application_controller.rb4
1 files changed, 4 insertions, 0 deletions
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