diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb index 596aaa68ccfa2bf62c534e1f7dc30835da57dc10..7dc8166edf5352980dd4e3d1199b63270a153e30 100644 --- a/app/controllers/omniauth_callbacks_controller.rb +++ b/app/controllers/omniauth_callbacks_controller.rb @@ -154,11 +154,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController message << "Create a GitLab account first, and then connect it to your #{label} account." end -<<<<<<< HEAD - flash[:alert] = message.join(' ') -======= flash[:notice] = message.join(' ') ->>>>>>> upstream/master redirect_to new_user_session_path end