diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-07 15:06:21 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-07 15:06:21 +0300 |
| commit | 84a0e65ac88c7a3db86a0e4347606ba093490bef (patch) | |
| tree | 860de954548b509e92f6f95a66c8c75cf389efb0 /lib/gitlab/favicon.rb | |
| parent | bf3d94a7332ff411b654137a1d1288c399fceba4 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/favicon.rb')
| -rw-r--r-- | lib/gitlab/favicon.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/favicon.rb b/lib/gitlab/favicon.rb index b5d308e462c..ce1370bab0f 100644 --- a/lib/gitlab/favicon.rb +++ b/lib/gitlab/favicon.rb @@ -7,7 +7,7 @@ module Gitlab image_name = if appearance.favicon.exists? appearance.favicon_path - elsif Gitlab::Utils.to_boolean(ENV['CANARY']) + elsif Gitlab.canary? 'favicon-yellow.png' elsif Rails.env.development? development_favicon |