diff options
| author | Alexis Reigel <alexis.reigel.ext@siemens.com> | 2017-12-07 13:15:49 +0100 |
|---|---|---|
| committer | Alexis Reigel <mail@koffeinfrei.org> | 2018-06-05 16:20:22 +0200 |
| commit | 949c30d42b91a0dd3959a3ca303b8f76158a2556 (patch) | |
| tree | f7a511a20399a065258aa8895852e58c85c4cef0 /lib | |
| parent | 9e14f437b6ed205744d916f5566ee2c11e52b734 (diff) | |
| download | gitlab-ce-949c30d42b91a0dd3959a3ca303b8f76158a2556.tar.gz | |
remove all .ico favicon variations, use png always
the ci status icons are generated client side, wo we don't need the
static files anymore.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/favicon.rb | 9 | ||||
| -rw-r--r-- | lib/gitlab/path_regex.rb | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/lib/gitlab/favicon.rb b/lib/gitlab/favicon.rb index e28d4c67661..d0178d0fdf9 100644 --- a/lib/gitlab/favicon.rb +++ b/lib/gitlab/favicon.rb @@ -3,16 +3,15 @@ module Gitlab class << self def main return custom_favicon_url(appearance_favicon.favicon_main.url) if appearance_favicon.exists? - return 'favicon-yellow.ico' if Gitlab::Utils.to_boolean(ENV['CANARY']) - return 'favicon-blue.ico' if Rails.env.development? + 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? - 'favicon.ico' + ActionController::Base.helpers.image_path('favicon.png') end def status_overlay(status_name) path = File.join( 'ci_favicons', - 'overlays', "#{status_name}.png" ) @@ -27,7 +26,7 @@ module Gitlab def available_status_names @available_status_names ||= begin - Dir.glob(Rails.root.join('app', 'assets', 'images', 'ci_favicons', 'overlays', "*.png")) + Dir.glob(Rails.root.join('app', 'assets', 'images', 'ci_favicons', '*.png')) .map { |file| File.basename(file, '.png') } .sort end diff --git a/lib/gitlab/path_regex.rb b/lib/gitlab/path_regex.rb index 4dc38aae61e..e5191f5c7f9 100644 --- a/lib/gitlab/path_regex.rb +++ b/lib/gitlab/path_regex.rb @@ -30,7 +30,7 @@ module Gitlab dashboard deploy.html explore - favicon.ico + favicon.png files groups health_check |