summaryrefslogtreecommitdiff
path: root/config/mail_room.yml
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-03-17 20:03:51 +0100
committerRémy Coutable <remy@rymai.me>2016-03-25 13:05:15 +0100
commit9f218fc184894d61c10f738c59bce97780f06e25 (patch)
treeedc94e1c3ac7bae80edb14f86810a12e98e13f5e /config/mail_room.yml
parent31e76baf610e1307090a6bac3a7b3d525bce057a (diff)
downloadgitlab-ce-9f218fc184894d61c10f738c59bce97780f06e25.tar.gz
Improve and finish the fallback to the In-Reply-To and References header for the reply-by-email feature2364-fallback-to-in-reply-to-header
A few things to note: - The IncomingEmail feature is now enabled even without a correctly-formatted sub-address - Message-ID for new thread mail are kept the same so that subsequent notifications to this thread are grouped in the thread by the email service that receives the notification (i.e. In-Reply-To of the answer == Message-ID of the first thread message) - To maximize our chance to be able to retrieve the reply key, we look for it in the In-Reply-To header and the References header - The pattern for the fallback reply message id is "reply-[key]@[gitlab_host]" - Improve docs thanks to Axil
Diffstat (limited to 'config/mail_room.yml')
-rw-r--r--config/mail_room.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/mail_room.yml b/config/mail_room.yml
index aed55f74eab..60257329f3e 100644
--- a/config/mail_room.yml
+++ b/config/mail_room.yml
@@ -17,7 +17,7 @@ if File.exists?(config_file)
config['start_tls'] = false if config['start_tls'].nil?
config['mailbox'] = "inbox" if config['mailbox'].nil?
- if config['enabled'] && config['address'] && config['address'].include?('%{key}')
+ if config['enabled'] && config['address']
redis_url = Gitlab::RedisConfig.new(rails_env).url
%>
-