diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-06-20 03:57:17 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-06-20 03:57:17 +0000 |
| commit | adeccba13676b831335e2f12f779f77602298b31 (patch) | |
| tree | 94058080a80b2c7ab8f1ed5af9eb1838ebbf90fa | |
| parent | d05a806fed0a6ddcee91ff806b730aaca162444a (diff) | |
| parent | 38514630c0fd52e2647b2be0928220c7c7567a69 (diff) | |
| download | gitlab-ce-adeccba13676b831335e2f12f779f77602298b31.tar.gz | |
Merge branch 'fix/facivon-url-if-uploads-object-store-enabled' into 'master'
fix(favicon): get favicon_path, so it works also with uploads object store
See merge request gitlab-org/gitlab-ce!29482
| -rw-r--r-- | changelogs/unreleased/fix-facivon-url-if-uploads-object-store-enabled.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/favicon.rb | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/changelogs/unreleased/fix-facivon-url-if-uploads-object-store-enabled.yml b/changelogs/unreleased/fix-facivon-url-if-uploads-object-store-enabled.yml new file mode 100644 index 00000000000..4e6d9c087ef --- /dev/null +++ b/changelogs/unreleased/fix-facivon-url-if-uploads-object-store-enabled.yml @@ -0,0 +1,5 @@ +--- +title: 'Fix favicon path with uploads of object store' +merge_request: 29482 +author: Roger Meier +type: fixed diff --git a/lib/gitlab/favicon.rb b/lib/gitlab/favicon.rb index 6e31064f737..519213e143c 100644 --- a/lib/gitlab/favicon.rb +++ b/lib/gitlab/favicon.rb @@ -5,8 +5,8 @@ module Gitlab class << self def main image_name = - if appearance_favicon.exists? - appearance_favicon.url + if appearance.favicon.exists? + appearance.favicon_path elsif Gitlab::Utils.to_boolean(ENV['CANARY']) 'favicon-yellow.png' elsif Rails.env.development? @@ -57,10 +57,6 @@ module Gitlab def appearance Gitlab::SafeRequestStore[:appearance] ||= (Appearance.current || Appearance.new) end - - def appearance_favicon - appearance.favicon - end end end end |