summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-03-01 16:24:43 +0000
committerDouwe Maan <douwe@gitlab.com>2016-03-01 16:24:43 +0000
commit6b0e37b05fae14530b10b9357ebaef87920222e3 (patch)
tree8ceef799362586b70ed490b56f14425d00a0845e /CHANGELOG
parentd4e327a592df080588ed8fe616979310000cb288 (diff)
parentf5202c20b0031f8b883576423e3320ca44c5eca3 (diff)
downloadgitlab-ce-6b0e37b05fae14530b10b9357ebaef87920222e3.tar.gz
Merge branch 'rel-url-fix' into 'master'
Fix relative URL See https://github.com/gitlabhq/gitlabhq/issues/10053 1. Same configuration way for relative URL like with Omnibus 2. Loading the relative configuration from Rakefile as Rails do not load initializers for `asset:precompile` First point has another positive side effect: no collisions (due to git controlled `application.rb`) any more during the upgrades of source based installations and relative url configuration - [x] tests on the source based installation - [x] tests on the centos&ubuntu omnibus packages Fixes: gitlab-org/gitlab-ce#13730, gitlab-org/gitlab-ce#13727, gitlab-org/omnibus-gitlab#1143 and https://github.com/gitlabhq/gitlabhq/issues/10053 See merge request !2979
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index ff6d384f7fd..088e31f7d48 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,7 @@ v 8.6.0 (unreleased)
v 8.5.2
- Fix sidebar overlapping content when screen width was below 1200px
- Fix error 500 when commenting on a commit
+ - Fix broken icons on installations with relative URL (Artem Sidorenko)
v 8.5.1
- Fix group projects styles