diff options
| author | Francisco Javier López <fjlopez@gitlab.com> | 2017-11-17 14:24:25 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-11-17 14:24:25 +0000 |
| commit | c7cf68bd6ff744e044944acad586e06badc481d4 (patch) | |
| tree | 6cf6af687696012525b6cb05b336bec13f049a10 /app/models/user.rb | |
| parent | 76b2a7caa5219662a29f0eb16f0507aac1976f33 (diff) | |
| download | gitlab-ce-c7cf68bd6ff744e044944acad586e06badc481d4.tar.gz | |
Changing OAuth lookup to be case insensitive
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index be8112749bf..71c34766451 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -269,8 +269,7 @@ class User < ActiveRecord::Base end def for_github_id(id) - joins(:identities) - .where(identities: { provider: :github, extern_uid: id.to_s }) + joins(:identities).merge(Identity.with_extern_uid(:github, id)) end # Find a User by their primary email or any associated secondary email |