summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2018-01-08 15:54:59 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2018-01-08 15:54:59 +0000
commit166e9f8fbabfec2b1c27c1adf2d1721b399a30ee (patch)
tree9cd9df5c006f755ff9246eb4573e4dcc70a2b0c9 /changelogs
parentaf3a8f96f8175353ef5860f4255d63be72a4c5bc (diff)
parent75e718f207083615252b9ef047c4c466d9fcb5a0 (diff)
downloadgitlab-ce-166e9f8fbabfec2b1c27c1adf2d1721b399a30ee.tar.gz
Merge branch '28260-fix-pages-custom-domain-url' into 'master'
Resolve "Fix wrong output protocol pattern when adding custom domain to Pages" Closes #28260 See merge request gitlab-org/gitlab-ce!16279
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/28260-fix-pages-custom-domain-url.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/28260-fix-pages-custom-domain-url.yml b/changelogs/unreleased/28260-fix-pages-custom-domain-url.yml
new file mode 100644
index 00000000000..edd63c4ea9c
--- /dev/null
+++ b/changelogs/unreleased/28260-fix-pages-custom-domain-url.yml
@@ -0,0 +1,5 @@
+---
+title: Generate HTTP URLs for custom Pages domains when appropriate
+merge_request: 16279
+author:
+type: fixed