diff options
| author | Imre Farkas <ifarkas@gitlab.com> | 2018-11-15 20:08:46 +0100 |
|---|---|---|
| committer | Imre Farkas <ifarkas@gitlab.com> | 2018-11-26 13:24:00 +0100 |
| commit | 350f2ba7620812f8ae93e30029451f2c0af4cb1d (patch) | |
| tree | d1563de7e73b5889b7b20e89103d2b32ce4b9a12 /app/models/user.rb | |
| parent | 3b23d06cbee9fb36014e86dee532c858e5f20cca (diff) | |
| download | gitlab-ce-350f2ba7620812f8ae93e30029451f2c0af4cb1d.tar.gz | |
User#find_by_any_email to respect confirmed flag on secondary emails
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 01eba7e0426..dbd754dd25a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -363,7 +363,7 @@ class User < ActiveRecord::Base from_users = from_users.confirmed if confirmed from_emails = joins(:emails).where(emails: { email: emails }) - from_emails = from_emails.confirmed if confirmed + from_emails = from_emails.confirmed.merge(Email.confirmed) if confirmed items = [from_users, from_emails] |