summaryrefslogtreecommitdiff
path: root/config/gitlab.yml.example
diff options
context:
space:
mode:
Diffstat (limited to 'config/gitlab.yml.example')
-rw-r--r--config/gitlab.yml.example8
1 files changed, 4 insertions, 4 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 856e75dc829..15930fc9079 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -96,10 +96,10 @@ production: &base
## Reply by email
# Allow users to comment on issues and merge requests by replying to notification emails.
- # For documentation on how to set this up, see http://doc.gitlab.com/ce/reply_by_email/README.html
- reply_by_email:
+ # For documentation on how to set this up, see http://doc.gitlab.com/ce/incoming_email/README.html
+ incoming_email:
enabled: false
- address: "replies+%{reply_key}@gitlab.example.com"
+ address: "incoming+%{key}@gitlab.example.com"
## Gravatar
## For Libravatar see: http://doc.gitlab.com/ce/customization/libravatar.html
@@ -425,4 +425,4 @@ test:
sync_ssh_keys: false
staging:
- <<: *base \ No newline at end of file
+ <<: *base