diff options
author | Sean McGivern <sean@gitlab.com> | 2017-04-20 13:33:51 +0300 |
---|---|---|
committer | Sean McGivern <sean@gitlab.com> | 2017-04-20 15:19:16 +0300 |
commit | 19970e1dba5a4c3c69ce6057814db2f37e13d1ad (patch) | |
tree | 80c71fb67e59263b870d016efaefbfe22ff17592 /lib/gitlab/email | |
parent | 57edc23385ad82d4428ba34f342aee07cb2d2ba6 (diff) |
Store projects in metrics for email replies
Diffstat (limited to 'lib/gitlab/email')
-rw-r--r-- | lib/gitlab/email/handler/create_note_handler.rb | 6 | ||||
-rw-r--r-- | lib/gitlab/email/handler/unsubscribe_handler.rb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/gitlab/email/handler/create_note_handler.rb b/lib/gitlab/email/handler/create_note_handler.rb index 0e22f2189ee..c66b0435f3a 100644 --- a/lib/gitlab/email/handler/create_note_handler.rb +++ b/lib/gitlab/email/handler/create_note_handler.rb @@ -7,6 +7,8 @@ module Gitlab class CreateNoteHandler < BaseHandler include ReplyProcessing + delegate :project, to: :sent_notification, allow_nil: true + def can_handle? mail_key =~ /\A\w+\z/ end @@ -32,10 +34,6 @@ module Gitlab sent_notification.recipient end - def project - sent_notification.project - end - def sent_notification @sent_notification ||= SentNotification.for(mail_key) end diff --git a/lib/gitlab/email/handler/unsubscribe_handler.rb b/lib/gitlab/email/handler/unsubscribe_handler.rb index 97d7a8d65ff..df491f060bf 100644 --- a/lib/gitlab/email/handler/unsubscribe_handler.rb +++ b/lib/gitlab/email/handler/unsubscribe_handler.rb @@ -4,6 +4,8 @@ module Gitlab module Email module Handler class UnsubscribeHandler < BaseHandler + delegate :project, to: :sent_notification, allow_nil: true + def can_handle? mail_key =~ /\A\w+#{Regexp.escape(Gitlab::IncomingEmail::UNSUBSCRIBE_SUFFIX)}\z/ end |