diff options
| -rw-r--r-- | app/helpers/appearances_helper.rb | 4 | ||||
| -rw-r--r-- | app/helpers/page_layout_helper.rb | 1 | ||||
| -rw-r--r-- | spec/helpers/page_layout_helper_spec.rb | 5 |
3 files changed, 10 insertions, 0 deletions
diff --git a/app/helpers/appearances_helper.rb b/app/helpers/appearances_helper.rb index f48db024e3f..52ee8aec4ad 100644 --- a/app/helpers/appearances_helper.rb +++ b/app/helpers/appearances_helper.rb @@ -33,4 +33,8 @@ module AppearancesHelper render 'shared/logo_type.svg' end end + + def brand_favicon + brand_item&.favicon + end end diff --git a/app/helpers/page_layout_helper.rb b/app/helpers/page_layout_helper.rb index a8397b03d63..b9b0e08cde5 100644 --- a/app/helpers/page_layout_helper.rb +++ b/app/helpers/page_layout_helper.rb @@ -39,6 +39,7 @@ module PageLayoutHelper end def favicon + return brand_favicon.default.url if brand_favicon return 'favicon-yellow.ico' if Gitlab::Utils.to_boolean(ENV['CANARY']) return 'favicon-blue.ico' if Rails.env.development? diff --git a/spec/helpers/page_layout_helper_spec.rb b/spec/helpers/page_layout_helper_spec.rb index b77114a8152..53ecf25612f 100644 --- a/spec/helpers/page_layout_helper_spec.rb +++ b/spec/helpers/page_layout_helper_spec.rb @@ -55,6 +55,11 @@ describe PageLayoutHelper do stub_env('CANARY', 'true') expect(helper.favicon).to eq 'favicon-yellow.ico' end + + it 'uses the custom favicon if an favicon appearance is present' do + create :appearance, favicon: fixture_file_upload(Rails.root.join('spec/fixtures/dk.png')) + expect(helper.favicon).to match %r{/uploads/-/system/appearance/favicon/\d+/default_dk.ico} + end end describe 'page_image' do |