deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge issue fixed

Browse source
This commit is contained in:
Florian Unglaub 2012-08-24 15:40:44 +02:00
parent 48443d20ca
commit 36ffdf36b9
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/omniauth_callbacks_controller.rb
View file

@ -33,7 +33,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
if current_user if current_user
# Change a logged-in user's authentication method: # Change a logged-in user's authentication method:
current_user.uid = uid current_user.extern_uid = uid
current_user.provider = provider current_user.provider = provider
current_user.save current_user.save
redirect_to profile_path redirect_to profile_path