diff options
| author | Douwe Maan <douwe@selenight.nl> | 2018-06-29 11:21:51 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2018-06-29 11:22:51 +0200 |
| commit | f83f1db4bde285ff8539e798a5b15383b06caff6 (patch) | |
| tree | 556db4f6fa055f00d9038c50f77e39ec62d82a21 /lib | |
| parent | ee2a9e0af0c91e4cc0d1c24acf35ff1eba1cc8db (diff) | |
| download | gitlab-ce-f83f1db4bde285ff8539e798a5b15383b06caff6.tar.gz | |
Read asset host from ActionController::Base instead of application config
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/favicon.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/favicon.rb b/lib/gitlab/favicon.rb index d512fc58e46..4850a6c0430 100644 --- a/lib/gitlab/favicon.rb +++ b/lib/gitlab/favicon.rb @@ -38,7 +38,8 @@ module Gitlab # we only want to create full urls when there's a different asset_host # configured. 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 else Gitlab.config.gitlab.base_url |