kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

It's for Message-ID so it should be message_id

Browse source
This commit is contained in:
Lin Jen-Shin 2016-05-20 18:21:58 -05:00
parent c2bc15a766
commit 32eae15f2f
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/gitlab/email/receiver.rb
View file

@ -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

6
lib/gitlab/incoming_email.rb
View file

@ -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]

4
spec/lib/gitlab/incoming_email_spec.rb
View file

@ -43,9 +43,9 @@ describe Gitlab::IncomingEmail, lib: true do
end
end
context 'self.key_from_fallback_reply_mail_id' do
context 'self.key_from_fallback_message_id' do
it 'returns reply key' do
expect(described_class.key_from_fallback_reply_mail_id('reply-key@localhost')).to eq('key')
expect(described_class.key_from_fallback_message_id('reply-key@localhost')).to eq('key')
end
end
end