diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-05-04 01:26:26 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-05-11 11:00:22 +0200 |
| commit | d283e60d42b5bd7ad6a1b0d5890a554e84db2e53 (patch) | |
| tree | f7099c90392081928e775a23926e02fd605ea0c3 | |
| parent | 0034e4f3981db8fb6fa18e94bab2c5d9d8b019de (diff) | |
| download | gitlab-ce-d283e60d42b5bd7ad6a1b0d5890a554e84db2e53.tar.gz | |
Merge branch 'signout-rel-url' into 'master'
Use sign out path only if not empty
Fixes: https://github.com/gitlabhq/gitlabhq/issues/10066
See merge request !3989
| -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 1c53b0b21a3..17b3f49aed1 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -117,7 +117,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 |