diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2016-05-21 02:21:58 +0300 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2016-05-21 02:23:04 +0300 |
commit | 32eae15f2f7ada5b5008f0fe9fb46f349cd4f367 (patch) | |
tree | a7c5d55c9f790ac74e063a223a5949c5032747f8 /lib | |
parent | c2bc15a7669b8f21b12314f8607a02cf7d8b4828 (diff) |
It's for Message-ID so it should be message_id
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/email/receiver.rb | 2 | ||||
-rw-r--r-- | lib/gitlab/incoming_email.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/gitlab/email/receiver.rb b/lib/gitlab/email/receiver.rb index 01a206666a4..daa1177a23a 100644 --- a/lib/gitlab/email/receiver.rb +++ b/lib/gitlab/email/receiver.rb @@ -60,7 +60,7 @@ module Gitlab def key_from_additional_headers Array(mail.references).find do |mail_id| - key = Gitlab::IncomingEmail.key_from_fallback_reply_mail_id(mail_id) + key = Gitlab::IncomingEmail.key_from_fallback_message_id(mail_id) break key if key end end diff --git a/lib/gitlab/incoming_email.rb b/lib/gitlab/incoming_email.rb index f4ef1559716..d7be50bd437 100644 --- a/lib/gitlab/incoming_email.rb +++ b/lib/gitlab/incoming_email.rb @@ -1,7 +1,7 @@ module Gitlab module IncomingEmail class << self - FALLBACK_REPLY_MAIL_ID_REGEX = /\Areply\-(.+)@#{Gitlab.config.gitlab.host}\Z/.freeze + FALLBACK_MESSAGE_ID_REGEX = /\Areply\-(.+)@#{Gitlab.config.gitlab.host}\Z/.freeze def enabled? config.enabled && config.address @@ -21,8 +21,8 @@ module Gitlab match[1] end - def key_from_fallback_reply_mail_id(mail_id) - match = mail_id.match(FALLBACK_REPLY_MAIL_ID_REGEX) + def key_from_fallback_message_id(mail_id) + match = mail_id.match(FALLBACK_MESSAGE_ID_REGEX) return unless match match[1] |