summaryrefslogtreecommitdiff
path: root/doc/administration/index.md
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-07-16 16:02:55 +0000
committerRémy Coutable <remy@rymai.me>2018-07-16 16:02:55 +0000
commit8048f99c21d0299313dcda172aae22fda8c519d3 (patch)
treeedf02d0adf376ee0cce7caa9c541c687bc25f43f /doc/administration/index.md
parent815947bf6785e1c458bad8d2d891e99279cab602 (diff)
parent2c5e6b272e7984400ac4d297553b3f4f50a8d5c4 (diff)
downloadgitlab-ce-8048f99c21d0299313dcda172aae22fda8c519d3.tar.gz
Merge branch 'master' into 'qa-48464-add-edit-delete-file-scenario'sliaquat/gitlab-ce-qa-48464-add-edit-delete-file-scenario
# Conflicts: # qa/qa.rb
Diffstat (limited to 'doc/administration/index.md')
-rw-r--r--doc/administration/index.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/administration/index.md b/doc/administration/index.md
index 922cc45d8c4..88190b2df5f 100644
--- a/doc/administration/index.md
+++ b/doc/administration/index.md
@@ -45,6 +45,7 @@ Learn how to install, configure, update, and maintain your GitLab instance.
- [Environment variables](environment_variables.md): Supported environment variables that can be used to override their defaults values in order to configure GitLab.
- [Plugins](plugins.md): With custom plugins, GitLab administrators can introduce custom integrations without modifying GitLab's source code.
- [Enforcing Terms of Service](../user/admin_area/settings/terms.md)
+- [Third party offers](../user/admin_area/settings/third_party_offers.md)
#### Customizing GitLab's appearance