diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-04-09 09:39:03 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-04-09 09:39:03 +0000 |
| commit | 63ab7c0f009001b99f6e7d7a7f21dadde1e6b969 (patch) | |
| tree | 6d3528666b98e5b9cea3773fb951663adbb2d09b /lib | |
| parent | a2a6a5cab66c2cfec6b770d070187badfd505b62 (diff) | |
| parent | f68aab1945679f76a0e9a51069cdc4f41e11821d (diff) | |
| download | gitlab-ce-63ab7c0f009001b99f6e7d7a7f21dadde1e6b969.tar.gz | |
Merge branch 'feature/#37403-clearer-email-handler' into 'master'
Make email handler clearer
Closes #37403
See merge request gitlab-org/gitlab-ce!17501
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/email/handler/create_issue_handler.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/email/handler/create_issue_handler.rb b/lib/gitlab/email/handler/create_issue_handler.rb index a616a80e8f5..05a60deb7d3 100644 --- a/lib/gitlab/email/handler/create_issue_handler.rb +++ b/lib/gitlab/email/handler/create_issue_handler.rb @@ -14,7 +14,7 @@ module Gitlab end def can_handle? - !incoming_email_token.nil? + !incoming_email_token.nil? && !incoming_email_token.include?("+") && !mail_key.include?(Gitlab::IncomingEmail::UNSUBSCRIBE_SUFFIX) end def execute |