diff options
| author | Alexis Reigel <mail@koffeinfrei.org> | 2017-09-26 16:22:04 +0200 |
|---|---|---|
| committer | Alexis Reigel <mail@koffeinfrei.org> | 2018-06-05 16:20:19 +0200 |
| commit | 8967fc0477d176cb5b93ad3a9f2cf19eaca14876 (patch) | |
| tree | bf700f1556945a999c783574fef3a892e0acaf6b /app/helpers | |
| parent | 40d8d7df4bd437efc81f0bdff5f93b4b65844cb5 (diff) | |
| download | gitlab-ce-8967fc0477d176cb5b93ad3a9f2cf19eaca14876.tar.gz | |
use custom main favicon
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/appearances_helper.rb | 4 | ||||
| -rw-r--r-- | app/helpers/page_layout_helper.rb | 1 |
2 files changed, 5 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? |