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
This commit is contained in:
Robert Speicher
2016-05-04 01:26:26 +00:00
+1 -1
View File
@@ -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