diff options
| author | Andrey Kumanyaev <me@zzet.org> | 2013-05-05 18:01:10 +0400 |
|---|---|---|
| committer | Andrey Kumanyaev <me@zzet.org> | 2013-05-05 18:01:10 +0400 |
| commit | 67ccc8b52aceebea9c0cb22b3277daf0b467c78e (patch) | |
| tree | 6139a7674fe0f9d70a0af51c383fd72aa91cc54c /lib/gitlab/auth.rb | |
| parent | 493b5ff011d5788f669adabf978a40b49b8cf6a3 (diff) | |
| download | gitlab-ce-67ccc8b52aceebea9c0cb22b3277daf0b467c78e.tar.gz | |
Replace old hashes with new 1.9 ruby hashes (rebase)
Diffstat (limited to 'lib/gitlab/auth.rb')
| -rw-r--r-- | lib/gitlab/auth.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb index 0fee33dbeb0..78d2196fbbe 100644 --- a/lib/gitlab/auth.rb +++ b/lib/gitlab/auth.rb @@ -10,7 +10,7 @@ module Gitlab @user elsif @user = User.find_by_email(email) log.info "Updating legacy LDAP user #{email} with extern_uid => #{uid}" - @user.update_attributes(:extern_uid => uid, :provider => provider) + @user.update_attributes(extern_uid: uid, provider: provider) @user else create_from_omniauth(auth, true) @@ -57,7 +57,7 @@ module Gitlab if @user = User.find_by_provider_and_extern_uid(provider, uid) @user elsif @user = User.find_by_email(email) - @user.update_attributes(:extern_uid => uid, :provider => provider) + @user.update_attributes(extern_uid: uid, provider: provider) @user else if Gitlab.config.omniauth['allow_single_sign_on'] |