summaryrefslogtreecommitdiff
path: root/doc/pages/administration.md
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-02-21 17:34:18 +0200
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2017-01-31 22:55:29 +0000
commit0a4585bee4a5f7edde61d7358fb3a30b8f8224a1 (patch)
tree8a3fab70fa62e5f0a09f51edc9e7ec0007dbdc23 /doc/pages/administration.md
parent96fed04452ff9b637c2298c05a89f1f14fa091f2 (diff)
downloadgitlab-ce-0a4585bee4a5f7edde61d7358fb3a30b8f8224a1.tar.gz
Add MR that custom CNAMEs were introduced
Diffstat (limited to 'doc/pages/administration.md')
-rw-r--r--doc/pages/administration.md5
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/pages/administration.md b/doc/pages/administration.md
index f52703b7e43..74c960afa4f 100644
--- a/doc/pages/administration.md
+++ b/doc/pages/administration.md
@@ -1,7 +1,10 @@
# GitLab Pages Administration
> **Note:**
-This feature was [introduced][ee-80] in GitLab EE 8.3.
+> This feature was first [introduced][ee-80] in GitLab EE 8.3.
+> Custom CNAMEs with TLS support were [introduced][ee-173] in GitLab EE 8.5.
+
+---
This document describes how to set up the _latest_ GitLab Pages feature. Make
sure to read the [changelog](#changelog) if you are upgrading to a new GitLab