diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-11-19 16:53:14 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-11-19 16:53:14 +0000 |
| commit | af1ed0e2bbabb72aff521aa2d67a4325dd94f711 (patch) | |
| tree | 143fac4538c3b20d5479c1f4096f52be26c870a8 /lib | |
| parent | d5f08596305a7643d884e57ffc0375c6a5a7dbcb (diff) | |
| parent | 59c4fb4ecb3aa81ea73a5fe75528ef969c28fa9d (diff) | |
| download | gitlab-ce-af1ed0e2bbabb72aff521aa2d67a4325dd94f711.tar.gz | |
Merge branch '54046-fix-by-any-email-for-private-commit-emails' into 'master'
Match users better by their private commit email
Closes #54046
See merge request gitlab-org/gitlab-ce!23080
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/private_commit_email.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/gitlab/private_commit_email.rb b/lib/gitlab/private_commit_email.rb index bade2248ccd..536fc9dae3a 100644 --- a/lib/gitlab/private_commit_email.rb +++ b/lib/gitlab/private_commit_email.rb @@ -18,6 +18,10 @@ module Gitlab match[:id].to_i end + def user_ids_for_emails(emails) + emails.map { |email| user_id_for_email(email) }.compact.uniq + end + def for_user(user) hostname = Gitlab::CurrentSettings.current_application_settings.commit_email_hostname |