From 38514630c0fd52e2647b2be0928220c7c7567a69 Mon Sep 17 00:00:00 2001
From: Roger Meier <r.meier@siemens.com>
Date: Tue, 11 Jun 2019 14:07:24 +0200
Subject: fix(favicon): get favicon_path, so it works also with uploads object
 store

---
 lib/gitlab/favicon.rb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'lib')

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
-- 
cgit v1.2.1