diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2019-03-05 16:02:32 +0100 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-03-12 11:10:40 +0100 |
| commit | 5d654a224fef19adec43ca7f8a7da51c131616fc (patch) | |
| tree | ca4a6a5c91b3ca231133a4963f93b43008251296 /lib/gitlab/favicon.rb | |
| parent | 0cabb555f0ba3afd74dbb9814bdeae6fc9651df2 (diff) | |
| download | gitlab-ce-5d654a224fef19adec43ca7f8a7da51c131616fc.tar.gz | |
Refactor Gitlab::Favicon for EE
This moves the development favicon name in Gitlab::Favicon to a separate
method, allowing EE to redefine it to return a custom favicon.
Diffstat (limited to 'lib/gitlab/favicon.rb')
| -rw-r--r-- | lib/gitlab/favicon.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/gitlab/favicon.rb b/lib/gitlab/favicon.rb index 1ae2f9dfd93..6e31064f737 100644 --- a/lib/gitlab/favicon.rb +++ b/lib/gitlab/favicon.rb @@ -10,7 +10,7 @@ module Gitlab elsif Gitlab::Utils.to_boolean(ENV['CANARY']) 'favicon-yellow.png' elsif Rails.env.development? - 'favicon-blue.png' + development_favicon else 'favicon.png' end @@ -18,6 +18,12 @@ module Gitlab ActionController::Base.helpers.image_path(image_name, host: host) end + def development_favicon + # This is a separate method so that EE can return a different favicon + # for development environments. + 'favicon-blue.png' + end + def status_overlay(status_name) path = File.join( 'ci_favicons', |