summaryrefslogtreecommitdiff
path: root/doc/administration/index.md
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-19 15:07:55 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-19 15:07:55 +0000
commitf92a53a216e6e7d5037ac701efbee5628f91aa9a (patch)
tree1eb957f0277b50002258681f61db869a2b683fec /doc/administration/index.md
parente3764d340e2849fccee8c06278d1f5f686edd35b (diff)
downloadgitlab-ce-f92a53a216e6e7d5037ac701efbee5628f91aa9a.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/index.md')
-rw-r--r--doc/administration/index.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/administration/index.md b/doc/administration/index.md
index 2a9980cddb3..4cafb4eb87c 100644
--- a/doc/administration/index.md
+++ b/doc/administration/index.md
@@ -119,7 +119,7 @@ Learn how to install, configure, update, and maintain your GitLab instance.
- [Auditor users](auditor_users.md): Users with read-only access to all projects, groups, and other resources on the GitLab instance. **(PREMIUM ONLY)**
- [Incoming email](incoming_email.md): Configure incoming emails to allow
users to [reply by email](reply_by_email.md), create [issues by email](../user/project/issues/managing_issues.md#new-issue-via-email) and
- [merge requests by email](../user/project/merge_requests/creating_merge_requests.md#create-new-merge-requests-by-email), and to enable [Service Desk](../user/project/service_desk.md).
+ [merge requests by email](../user/project/merge_requests/creating_merge_requests.md#new-merge-request-by-email-core-only), and to enable [Service Desk](../user/project/service_desk.md).
- [Postfix for incoming email](reply_by_email_postfix_setup.md): Set up a
basic Postfix mail server with IMAP authentication on Ubuntu for incoming
emails.