Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 1 deletions

diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb
index ac1d7ecc01c..5bd3b74af1f 100644
--- a/app/controllers/omniauth_callbacks_controller.rb
+++ b/app/controllers/omniauth_callbacks_controller.rb
@@ -186,7 +186,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
         persist_accepted_terms_if_required(user) if new_user
 
         store_after_sign_up_path_for_user if intent_to_register?
-        sign_in_and_redirect(user, event: :authentication)
+        sign_in_and_redirect_or_confirm_identity(user, auth_user, new_user)
       end
     else
       fail_login(user)
@@ -316,6 +316,11 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
   def store_after_sign_up_path_for_user
     store_location_for(:user, users_sign_up_welcome_path)
   end
+
+  # overridden in EE
+  def sign_in_and_redirect_or_confirm_identity(user, _, _)
+    sign_in_and_redirect(user, event: :authentication)
+  end
 end
 
 OmniauthCallbacksController.prepend_mod_with('OmniauthCallbacksController')