From f5202c20b0031f8b883576423e3320ca44c5eca3 Mon Sep 17 00:00:00 2001
From: Artem Sidorenko <artem@posteo.de>
Date: Thu, 25 Feb 2016 23:10:32 +0100
Subject: [PATCH] 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.
---
CHANGELOG | 1 +
Rakefile | 3 +++
2 files changed, 4 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index d3e28dcfc766e..cb5a5662827aa 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
diff --git a/Rakefile b/Rakefile
index 35b2f05cbb456..5dd389d5678e1 100755
--- a/Rakefile
+++ b/Rakefile
@@ -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
--
GitLab