summaryrefslogtreecommitdiff
path: root/config/mail_room.yml.example
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-08-26 17:53:31 -0700
committerDouwe Maan <douwe@gitlab.com>2015-08-26 17:53:31 -0700
commit843694f90270e290f164bed68362500c9e331a46 (patch)
tree0e20cc09df536365db817ba8aef4c77d3d0c684e /config/mail_room.yml.example
parent6afd69f4445cc0688aa1695389eb3f79033e3121 (diff)
parentde3b7d9c522db8d129a64f2b86297cf90413cb1e (diff)
downloadgitlab-ce-843694f90270e290f164bed68362500c9e331a46.tar.gz
Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
Diffstat (limited to 'config/mail_room.yml.example')
-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