Commit 46328b12 authored by Alexis Reigel's avatar Alexis Reigel Committed by Alexis Reigel

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

probably due to recent changes in `UploadsController`.
parent b4d84c07
...@@ -2,7 +2,7 @@ module Gitlab ...@@ -2,7 +2,7 @@ module Gitlab
class Favicon class Favicon
class << self class << self
def main 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-yellow.png') if Gitlab::Utils.to_boolean(ENV['CANARY'])
return ActionController::Base.helpers.image_path('favicon-blue.png') if Rails.env.development? return ActionController::Base.helpers.image_path('favicon-blue.png') if Rails.env.development?
...@@ -35,13 +35,6 @@ module Gitlab ...@@ -35,13 +35,6 @@ module Gitlab
def appearance_favicon def appearance_favicon
appearance.favicon appearance.favicon
end 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 end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment