summaryrefslogtreecommitdiff
path: root/app/controllers/omniauth_callbacks_controller.rb
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2017-08-15 13:44:37 -0400
committerRobert Speicher <rspeicher@gmail.com>2017-08-15 13:44:37 -0400
commit4edfad96784e8f77ec8ead26f01b4012977ba58a (patch)
treeca0ee5439beeaa96f7a7acd749c9e1c67a6dab6b /app/controllers/omniauth_callbacks_controller.rb
parent05151f7699ee2adf67ce835413dfdbd80c58a3e5 (diff)
downloadgitlab-ce-4edfad96784e8f77ec8ead26f01b4012977ba58a.tar.gz
Enable Layout/TrailingWhitespace cop and auto-correct offenses
Diffstat (limited to 'app/controllers/omniauth_callbacks_controller.rb')
-rw-r--r--app/controllers/omniauth_callbacks_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb
index b4213574561..7444826a5d1 100644
--- a/app/controllers/omniauth_callbacks_controller.rb
+++ b/app/controllers/omniauth_callbacks_controller.rb
@@ -142,13 +142,13 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
def oauth
@oauth ||= request.env['omniauth.auth']
end
-
+
def fail_login
error_message = @user.errors.full_messages.to_sentence
return redirect_to omniauth_error_path(oauth['provider'], error: error_message)
end
-
+
def fail_ldap_login
flash[:alert] = 'Access denied for your LDAP account.'