summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMałgorzata Ksionek <meksionek@gmail.com>2019-04-29 17:38:41 +0200
committerMałgorzata Ksionek <meksionek@gmail.com>2019-05-06 11:02:40 +0200
commit1e49d8889c11676d6cf9a43d88ac8f82c17931d3 (patch)
tree794e4b83702a80b7ebcee4112d91ad84c1f6ab63
parentf9f7d28cdc6384423ccd84eff25000058f3e3e1e (diff)
downloadgitlab-ce-1e49d8889c11676d6cf9a43d88ac8f82c17931d3.tar.gz
Remove from providers with icon
Remove puts Remove puts
-rw-r--r--app/controllers/omniauth_callbacks_controller.rb5
-rw-r--r--lib/gitlab/request_forgery_protection.rb1
2 files changed, 1 insertions, 5 deletions
diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb
index 1b60f4c83ed..b4829a958b0 100644
--- a/app/controllers/omniauth_callbacks_controller.rb
+++ b/app/controllers/omniauth_callbacks_controller.rb
@@ -125,14 +125,12 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
def sign_in_user_flow(auth_user_class)
auth_user = build_auth_user(auth_user_class)
user = auth_user.find_and_update!
- puts auth_user.valid_sign_in?
- puts user.id
if auth_user.valid_sign_in?
log_audit_event(user, with: oauth['provider'])
set_remember_me(user)
- puts user.two_factor_enabled? && !auth_user.bypass_two_factor?
+
if user.two_factor_enabled? && !auth_user.bypass_two_factor?
prompt_for_two_factor(user)
else
@@ -165,7 +163,6 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
def fail_login(user)
error_message = user.errors.full_messages.to_sentence
- puts error_message
return redirect_to omniauth_error_path(oauth['provider'], error: error_message)
end
diff --git a/lib/gitlab/request_forgery_protection.rb b/lib/gitlab/request_forgery_protection.rb
index 4a6ed9aa6ac..b1e478093d3 100644
--- a/lib/gitlab/request_forgery_protection.rb
+++ b/lib/gitlab/request_forgery_protection.rb
@@ -18,7 +18,6 @@ module Gitlab
end
def index
- puts 'here'
head :ok
end
end