the '?' favicon hack doesn't seem to be required

probably due to recent changes in `UploadsController`.

1 files changed, 1 insertions, 8 deletions

diff --git a/lib/gitlab/favicon.rb b/lib/gitlab/favicon.rb
index e3e4a18e241..d554d100ad1 100644
--- a/lib/gitlab/favicon.rb
+++ b/lib/gitlab/favicon.rb
@@ -2,7 +2,7 @@ module Gitlab
   class Favicon
     class << self
       def main
-        return custom_favicon_url(appearance_favicon.favicon_main.url) if appearance_favicon.exists?
+        return appearance_favicon.favicon_main.url if appearance_favicon.exists?
         return ActionController::Base.helpers.image_path('favicon-yellow.png') if Gitlab::Utils.to_boolean(ENV['CANARY'])
         return ActionController::Base.helpers.image_path('favicon-blue.png') if Rails.env.development?
 
@@ -35,13 +35,6 @@ module Gitlab
       def appearance_favicon
         appearance.favicon
       end
-
-      # Without the '?' at the end of the favicon url the custom favicon (i.e.
-      # the favicons that are served through `UploadController`) are not shown
-      # in the browser.
-      def custom_favicon_url(url)
-        "#{url}?"
-      end
     end
   end
 end