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

Merge branch 'signout-rel-url' into 'master'
351df5a9 · Robert Speicher · d446c9db · d6c2d6ba · 351df5a9
Commit 351df5a9 authored May 04, 2016 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

application_controller.rb app/controllers/application_controller.rb +1 -1

No files found.
--- 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