fix(favicon): get favicon_path, so it works also with uploads object store
This commit is contained in:
parent
577832598f
commit
38514630c0
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: 'Fix favicon path with uploads of object store'
|
||||||
|
merge_request: 29482
|
||||||
|
author: Roger Meier
|
||||||
|
type: fixed
|
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue