diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-27 21:09:21 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-27 21:09:21 +0300 |
commit | e0fa0638a422c3e20d4423c9bb69d79afc9c7d3d (patch) | |
tree | 9abb3c0706576bbda895fe9539a55556930606e2 /lib/gitlab/email | |
parent | f8d15ca65390475e356b06dedc51e10ccd179f86 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/email')
-rw-r--r-- | lib/gitlab/email/receiver.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/gitlab/email/receiver.rb b/lib/gitlab/email/receiver.rb index f028102da9b..b7b9288517d 100644 --- a/lib/gitlab/email/receiver.rb +++ b/lib/gitlab/email/receiver.rb @@ -34,8 +34,7 @@ module Gitlab ignore_auto_reply!(mail) - mail_key = extract_mail_key(mail) - handler = Handler.for(mail, mail_key) + handler = find_handler(mail) raise UnknownIncomingEmail unless handler @@ -46,6 +45,11 @@ module Gitlab private + def find_handler(mail) + mail_key = extract_mail_key(mail) + Handler.for(mail, mail_key) + end + def build_mail Mail::Message.new(@raw) rescue Encoding::UndefinedConversionError, |