diff options
| author | Elan Ruusamäe <glen@delfi.ee> | 2016-11-02 00:32:20 +0200 |
|---|---|---|
| committer | Elan Ruusamäe <glen@delfi.ee> | 2016-11-04 15:44:57 +0200 |
| commit | 31704680cc967f0a053edc70db828ff780d7d0e4 (patch) | |
| tree | e22fd06d9d846e13a90164a5bd6dde67a2838532 | |
| parent | e4c05de75ccec1b0d64a7a994f05d54bffc903e5 (diff) | |
| download | gitlab-ce-31704680cc967f0a053edc70db828ff780d7d0e4.tar.gz | |
post_receive: accept any user email from last commit
| -rw-r--r-- | changelogs/unreleased/post_receive-any-email.yml | 4 | ||||
| -rw-r--r-- | lib/gitlab/identifier.rb | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changelogs/unreleased/post_receive-any-email.yml b/changelogs/unreleased/post_receive-any-email.yml new file mode 100644 index 00000000000..3710b1b4b46 --- /dev/null +++ b/changelogs/unreleased/post_receive-any-email.yml @@ -0,0 +1,4 @@ +--- +title: "post_receive: accept any user email from last commit" +merge_request: 7225 +author: Elan Ruusamäe diff --git a/lib/gitlab/identifier.rb b/lib/gitlab/identifier.rb index f8809db21aa..c5acf18beb5 100644 --- a/lib/gitlab/identifier.rb +++ b/lib/gitlab/identifier.rb @@ -24,7 +24,7 @@ module Gitlab email = commit.author_email identify_with_cache(:email, email) do - User.find_by(email: email) + User.find_by_any_email(email) end end |