diff options
| author | Artem Sidorenko <artem@posteo.de> | 2016-02-25 23:10:32 +0100 |
|---|---|---|
| committer | Artem Sidorenko <artem@posteo.de> | 2016-02-29 21:17:48 +0100 |
| commit | f5202c20b0031f8b883576423e3320ca44c5eca3 (patch) | |
| tree | 9f11285c56e62a7c75eb07ee0e8a98f85454bd6f | |
| parent | 28ba8ed5f594251604298be89019bd0d105fd49f (diff) | |
| download | gitlab-ce-f5202c20b0031f8b883576423e3320ca44c5eca3.tar.gz | |
Include relative url configuration in rake tasks
initializers are not loaded during the rake task assets:precompile,
so assets generation runs without relative url configuration in Rails
and produces broken assets.
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rwxr-xr-x | Rakefile | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index d3e28dcfc76..cb5a5662827 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -10,6 +10,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 @@ -4,4 +4,7 @@ require File.expand_path('../config/application', __FILE__) +relative_url_conf = File.expand_path('../config/initializers/relative_url', __FILE__) +require relative_url_conf if File.exist?("#{relative_url_conf}.rb") + Gitlab::Application.load_tasks |