diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-03-01 19:24:43 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-03-01 19:37:51 +0300 |
commit | 58e247d83bd7dd94ab0934a9196b427748e5603c (patch) | |
tree | b982af31ae74a1af8884bd203ac7791a300e3266 /CHANGELOG | |
parent | c081928d0623e50a1f96b46f3ca447de942e50f4 (diff) |
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-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index ec5a5a01636..915566d5af8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,6 +5,7 @@ v 8.5.2 - Don't repeat labels listed on Labels tab - Bring the "branded appearance" feature from EE to CE - Fix error 500 when commenting on a commit + - Fix broken icons on installations with relative URL (Artem Sidorenko) - Improve implementation to check read access to forks and add pagination - Don't show any "2FA required" message if it's not actually required - Update Rails to 4.2.5.2 |