Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2015-08-25 00:56:07 +0300
committerRobert Speicher <robert@gitlab.com>2015-08-25 00:56:07 +0300
commitc52fe24c3694463c828c5efa0a38510cb8229a36 (patch)
treedf44bb500f488b5dc33b7b98783b5ceb056f5505 /config
parentf9ac553db1d0b97525ae4bdfbc83adff4537fa82 (diff)
parent208888038375d48cc91cf481a3f8509d63d8e1ad (diff)
Merge branch 'reply-by-email-improvements' into 'master'
Ignore empty incoming messages (Reply by email) We should also update mail_room when https://github.com/tpitale/mail_room/pull/35 goes in, but that can wait a bit. See merge request !1190
Diffstat (limited to 'config')
-rw-r--r--config/mail_room.yml.example2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/mail_room.yml.example b/config/mail_room.yml.example
index 28366eb7394..dd8edfc42eb 100644
--- a/config/mail_room.yml.example
+++ b/config/mail_room.yml.example
@@ -14,6 +14,8 @@
# :name: "inbox"
# # Always "sidekiq".
# :delivery_method: sidekiq
+ # # Always true.
+ # :delete_after_delivery: true
# :delivery_options:
# # The URL to the Redis server used by Sidekiq. Should match the URL in config/resque.yml.
# :redis_url: redis://localhost:6379