diff options
| author | Florian Unglaub <florian.unglaub@nix-wie-weg.de> | 2012-08-24 15:40:44 +0200 |
|---|---|---|
| committer | Florian Unglaub <florian.unglaub@nix-wie-weg.de> | 2012-08-24 15:40:44 +0200 |
| commit | 36ffdf36b96a877154f265327d83d022ed27e9e4 (patch) | |
| tree | 37b3d96e057573367b2cb5c5091c8506643423cd /app/controllers/omniauth_callbacks_controller.rb | |
| parent | 48443d20ca9aa10323c1b81835e519680b10debc (diff) | |
| download | gitlab-ce-36ffdf36b96a877154f265327d83d022ed27e9e4.tar.gz | |
Merge issue fixed
Diffstat (limited to 'app/controllers/omniauth_callbacks_controller.rb')
| -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 9b40e5640d0..00ec7c42603 100644 --- a/app/controllers/omniauth_callbacks_controller.rb +++ b/app/controllers/omniauth_callbacks_controller.rb @@ -33,7 +33,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController if current_user # Change a logged-in user's authentication method: - current_user.uid = uid + current_user.extern_uid = uid current_user.provider = provider current_user.save redirect_to profile_path |