summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-10-11 13:27:23 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-10-11 13:27:23 +0000
commit38978fa53ffb7b263f987cb1fca84722c83b2fec (patch)
tree18d058c77c1165f15dcf9556fb3a512c1bdfaa3b /config
parent8f4e754414c8ad9b5007e5c1f5fb6fe5a6bbd3f7 (diff)
parentdffd33252f029901e33883935b20f6b0368d819b (diff)
downloadgitlab-ce-38978fa53ffb7b263f987cb1fca84722c83b2fec.tar.gz
Merge branch 'docs/refactor-reply-by-email' into 'master'
Move reply by email docs to a new location ## What does this MR do? Move reply by email docs to a new location. Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/3349 ## Moving docs to a new location? See the guidelines: http://docs.gitlab.com/ce/development/doc_styleguide.html#changing-document-location - [ ] Make sure the old link is not removed and has its contents replaced with a link to the new location. - [ ] Make sure internal links pointing to the document in question are not broken. - [ ] Search and replace any links referring to old docs in GitLab Rails app, specifically under the `app/views/` directory. - [ ] If working on CE, submit an MR to EE with the changes as well. See merge request !6517
Diffstat (limited to 'config')
-rw-r--r--config/gitlab.yml.example2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index a79356923b2..114ceac8e1f 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -112,7 +112,7 @@ 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/incoming_email/README.html
+ # For documentation on how to set this up, see http://doc.gitlab.com/ce/administration/reply_by_email.html
incoming_email:
enabled: false