diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-03 18:07:15 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-03 18:07:15 +0300 |
commit | fdd5c2a476dade1dd0874e37ab0c0b9ff88381ab (patch) | |
tree | 4abb334a7f0fab9698e20e2e6e672abc66c37113 /lib/gitlab/email | |
parent | a3759fc2e1f8aa1493840ab0d4ebd4a2e5f495aa (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/email')
-rw-r--r-- | lib/gitlab/email/handler/create_issue_handler.rb | 2 | ||||
-rw-r--r-- | lib/gitlab/email/handler/service_desk_handler.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/email/handler/create_issue_handler.rb b/lib/gitlab/email/handler/create_issue_handler.rb index c41c93b6ec0..e21a88c4e0d 100644 --- a/lib/gitlab/email/handler/create_issue_handler.rb +++ b/lib/gitlab/email/handler/create_issue_handler.rb @@ -73,7 +73,7 @@ module Gitlab end def can_handle_legacy_format? - project_path && incoming_email_token.exclude?('+') && mail_key.exclude?(Gitlab::Email::Common::UNSUBSCRIBE_SUFFIX_LEGACY) + project_path && !incoming_email_token.include?('+') && !mail_key.include?(Gitlab::Email::Common::UNSUBSCRIBE_SUFFIX_LEGACY) end end end diff --git a/lib/gitlab/email/handler/service_desk_handler.rb b/lib/gitlab/email/handler/service_desk_handler.rb index 8b436bb7a29..06365296a76 100644 --- a/lib/gitlab/email/handler/service_desk_handler.rb +++ b/lib/gitlab/email/handler/service_desk_handler.rb @@ -186,7 +186,7 @@ module Gitlab end def can_handle_legacy_format? - project_path && project_path.include?('/') && mail_key.exclude?('+') + project_path && project_path.include?('/') && !mail_key.include?('+') end def author |