BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 3e4e5f70 by Dmitriy Zaporozhets
Options

Merge branch 'improve-oauth-ux' into 'master'

Improve OAuth UX See merge request !1489
parents 0a34f2dc 03c8bf39
Showing with 1 addition and 1 deletion
app/controllers/omniauth_callbacks_controller.rb
...@@ -44,7 +44,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController ...@@ -44,7 +44,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
if current_user if current_user
# Add new authentication method # Add new authentication method
current_user.identities.find_or_create_by(extern_uid: oauth['uid'], provider: oauth['provider']) current_user.identities.find_or_create_by(extern_uid: oauth['uid'], provider: oauth['provider'])
redirect_to profile_path redirect_to profile_account_path, notice: 'Authentication method updated'
else else
@user = Gitlab::OAuth::User.new(oauth) @user = Gitlab::OAuth::User.new(oauth)
@user.save @user.save
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment