diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-05-04 01:26:26 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-05-04 01:26:26 +0000 |
| commit | 351df5a90c9f3d9fd57bca0a8220f7d72e82caef (patch) | |
| tree | 2f0df33f99f97a08f5f72455e77d77acfec867e4 /app | |
| parent | d446c9db51cead1c5c283a62840121f3a0e08bea (diff) | |
| parent | d6c2d6bab9f00c288df3318424c4c1bbbca614dc (diff) | |
| download | gitlab-ce-351df5a90c9f3d9fd57bca0a8220f7d72e82caef.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
Diffstat (limited to 'app')
| -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 |