diff options
| author | Brett Walker <bwalker@gitlab.com> | 2018-12-11 12:01:02 -0600 |
|---|---|---|
| committer | Brett Walker <bwalker@gitlab.com> | 2019-01-03 14:37:35 -0600 |
| commit | 23d5f4c99138a74cb4176bfca3fe3fdad1beecc4 (patch) | |
| tree | 3f450834de26cbc843f718a285312ee09b90c1c1 /lib/gitlab/incoming_email.rb | |
| parent | 3a60173738c277b7ad7da31ebb577d1aaf694485 (diff) | |
| download | gitlab-ce-23d5f4c99138a74cb4176bfca3fe3fdad1beecc4.tar.gz | |
Use new unsubscribe link
We now use `-unsubscribe` instead of `+unsubscribe`
in order to support catch all email addresses
Diffstat (limited to 'lib/gitlab/incoming_email.rb')
| -rw-r--r-- | lib/gitlab/incoming_email.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/gitlab/incoming_email.rb b/lib/gitlab/incoming_email.rb index 20fc8226611..d310fa69e62 100644 --- a/lib/gitlab/incoming_email.rb +++ b/lib/gitlab/incoming_email.rb @@ -2,8 +2,9 @@ module Gitlab module IncomingEmail - UNSUBSCRIBE_SUFFIX = '+unsubscribe'.freeze - WILDCARD_PLACEHOLDER = '%{key}'.freeze + UNSUBSCRIBE_SUFFIX = '-unsubscribe'.freeze + UNSUBSCRIBE_SUFFIX_OLD = '+unsubscribe'.freeze + WILDCARD_PLACEHOLDER = '%{key}'.freeze class << self def enabled? @@ -22,6 +23,7 @@ module Gitlab config.address.sub(WILDCARD_PLACEHOLDER, key) end + # example: incoming+1234567890abcdef1234567890abcdef-unsubscribe@incoming.gitlab.com def unsubscribe_address(key) config.address.sub(WILDCARD_PLACEHOLDER, "#{key}#{UNSUBSCRIBE_SUFFIX}") end |