diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-09-21 09:46:47 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-09-21 10:35:37 +0200 |
| commit | ee028d9d60522f8993a0b2429ac8a0631d59229a (patch) | |
| tree | 5e028593ff4394df287de8f61824c8d004a81688 /config/gitlab.yml.example | |
| parent | 11bbc06b4bbcb678f3ee6b8f1d143ed86d25a76c (diff) | |
| download | gitlab-ce-ee028d9d60522f8993a0b2429ac8a0631d59229a.tar.gz | |
Rename reply_by_email to incoming_email to prepare for the future.
Diffstat (limited to 'config/gitlab.yml.example')
| -rw-r--r-- | config/gitlab.yml.example | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 69cdf497a84..7304dd6f6b2 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 |