root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

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
This commit is contained in:
Stan Hu 2019-06-20 03:57:17 +00:00
parent d05a806fed 38514630c0
commit adeccba136
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changelogs/unreleased/fix-facivon-url-if-uploads-object-store-enabled.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: 'Fix favicon path with uploads of object store'
merge_request: 29482
author: Roger Meier
type: fixed

8
lib/gitlab/favicon.rb
View File

@ -5,8 +5,8 @@ module Gitlab
class << self class << self
def main def main
image_name = image_name =
if appearance_favicon.exists? if appearance.favicon.exists?
appearance_favicon.url appearance.favicon_path
elsif Gitlab::Utils.to_boolean(ENV['CANARY']) elsif Gitlab::Utils.to_boolean(ENV['CANARY'])
'favicon-yellow.png' 'favicon-yellow.png'
elsif Rails.env.development? elsif Rails.env.development?
@ -57,10 +57,6 @@ module Gitlab
def appearance def appearance
Gitlab::SafeRequestStore[:appearance] ||= (Appearance.current || Appearance.new) Gitlab::SafeRequestStore[:appearance] ||= (Appearance.current || Appearance.new)
end end
def appearance_favicon
appearance.favicon
end
end end
end end
end end