Commit f83f1db4 authored by Douwe Maan's avatar Douwe Maan

Read asset host from ActionController::Base instead of application config

parent ee2a9e0a
---
title: Always serve favicon from main GitLab domain so that CI badge can be drawn
over it
merge_request:
author:
type: fixed
...@@ -38,7 +38,8 @@ module Gitlab ...@@ -38,7 +38,8 @@ module Gitlab
# we only want to create full urls when there's a different asset_host # we only want to create full urls when there's a different asset_host
# configured. # configured.
def host def host
if Gitlab::Application.config.asset_host.nil? || Gitlab::Application.config.asset_host == Gitlab.config.gitlab.base_url asset_host = ActionController::Base.asset_host
if asset_host.nil? || asset_host == Gitlab.config.gitlab.base_url
nil nil
else else
Gitlab.config.gitlab.base_url Gitlab.config.gitlab.base_url
......
...@@ -32,7 +32,7 @@ RSpec.describe Gitlab::Favicon, :request_store do ...@@ -32,7 +32,7 @@ RSpec.describe Gitlab::Favicon, :request_store do
end end
it 'returns a full url when the asset host is configured' do it 'returns a full url when the asset host is configured' do
allow(Gitlab::Application.config).to receive(:asset_host).and_return('http://assets.local') allow(ActionController::Base).to receive(:asset_host).and_return('http://assets.local')
expect(described_class.main).to match %r{^http://localhost/assets/favicon-(?:\h+).png$} expect(described_class.main).to match %r{^http://localhost/assets/favicon-(?:\h+).png$}
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment