diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-09 16:45:25 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-09 16:45:25 +0000 |
| commit | 3e4e5f7063ee555ae63528f7df9241022db5d916 (patch) | |
| tree | 351ed6208d7298db37a824aabfa3d3b506dff998 | |
| parent | 0a34f2dcb562098c481140246f7ac22683b38d76 (diff) | |
| parent | 03c8bf39e10b52bc5e9f128fe53876ad8b398dac (diff) | |
| download | gitlab-ce-3e4e5f7063ee555ae63528f7df9241022db5d916.tar.gz | |
Merge branch 'improve-oauth-ux' into 'master'
Improve OAuth UX
See merge request !1489
| -rw-r--r-- | app/controllers/omniauth_callbacks_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb index 442a1cf7518..bb9d65c9ed6 100644 --- a/app/controllers/omniauth_callbacks_controller.rb +++ b/app/controllers/omniauth_callbacks_controller.rb @@ -44,7 +44,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController if current_user # Add new authentication method 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 @user = Gitlab::OAuth::User.new(oauth) @user.save |