diff options
author | Alexis Reigel <alexis.reigel.ext@siemens.com> | 2018-04-09 17:49:41 +0300 |
---|---|---|
committer | Alexis Reigel <mail@koffeinfrei.org> | 2018-06-05 17:20:23 +0300 |
commit | 46328b1242d6508f7ee13c6b6e40d9aad6af07ea (patch) | |
tree | b66ddfb3fdf71f60a406b1774ed4e7695c6353de /lib/gitlab/favicon.rb | |
parent | b4d84c07bcf143aeab7abccb8d0cdb849f605af5 (diff) |
the '?' favicon hack doesn't seem to be required
probably due to recent changes in `UploadsController`.
Diffstat (limited to 'lib/gitlab/favicon.rb')
-rw-r--r-- | lib/gitlab/favicon.rb | 9 |
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 |