summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2018-02-20 14:44:02 +0100
committerJames Lopez <james@jameslopez.es>2018-02-20 14:44:02 +0100
commit4e8bf355c16f3e00a78df3ac3324b85b98799201 (patch)
tree5342158a9bfda100b877c31e84bf2eda15a5b582
parent0dc247d9c73dca8a59bae4ad2a259cac80d6953e (diff)
downloadgitlab-ce-4e8bf355c16f3e00a78df3ac3324b85b98799201.tar.gz
fix redirect
-rw-r--r--app/controllers/omniauth_callbacks_controller.rb8
1 files changed, 5 insertions, 3 deletions
diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb
index 18dbcce0d33..bc0ed1c8062 100644
--- a/app/controllers/omniauth_callbacks_controller.rb
+++ b/app/controllers/omniauth_callbacks_controller.rb
@@ -96,9 +96,11 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
end
def auth0
- fail_auth0_login if oauth['uid'].blank?
-
- handle_omniauth
+ if oauth['uid'].blank?
+ fail_auth0_login
+ else
+ handle_omniauth
+ end
end
private