diff options
author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-11-27 15:37:54 +0300 |
---|---|---|
committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-11-27 15:37:54 +0300 |
commit | 92bfb3c5be8ce9b034421040cadc23fe067e5c4b (patch) | |
tree | 9a542e5a33984f839dd752bda0ec8649fa48dbe9 /app | |
parent | 397fd09ac4ba7353580f4d3a88c80105d51ff47a (diff) | |
parent | a937eabe4c0769de881a54867d0e42b3bed4be35 (diff) |
Merge branch 'if-ce-54109-fix_user_by_any_email' into 'master'
User#find_by_any_email to respect confirmed flag on secondary emails
See merge request gitlab-org/gitlab-ce!23181
Diffstat (limited to 'app')
-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] |