diff options
| author | Timothy Andrew <mail@timothyandrew.net> | 2016-05-11 09:52:58 +0530 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2016-05-11 09:52:58 +0530 |
| commit | 2e9742997ddbfaeff350eb5334b7f641a779550c (patch) | |
| tree | 4dacf94eb6b6f67fc5c8b89b117f0babe1c2b8a4 /app/controllers/application_controller.rb | |
| parent | 2768e99ac386598480a7ac5490deee644125dfa1 (diff) | |
| parent | f7d2297c86eb84c2e2fbfa6b3e007da3c7adb5ae (diff) | |
| download | gitlab-ce-2e9742997ddbfaeff350eb5334b7f641a779550c.tar.gz | |
Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokens
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 eb5ffc44c3b..72ba1a85cff 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -126,7 +126,7 @@ class ApplicationController < ActionController::Base end def after_sign_out_path_for(resource) - current_application_settings.after_sign_out_path || new_user_session_path + current_application_settings.after_sign_out_path.presence || new_user_session_path end def abilities |