summaryrefslogtreecommitdiff
path: root/app/helpers/page_layout_helper.rb
diff options
context:
space:
mode:
authorAlexis Reigel <mail@koffeinfrei.org>2017-09-26 17:04:37 +0200
committerAlexis Reigel <mail@koffeinfrei.org>2018-06-05 16:20:19 +0200
commita6f3f6b8cd2e79acbc824c401435284635071e1a (patch)
tree45155dd3a0efe1071a1aa7313ac26fc7db616aa8 /app/helpers/page_layout_helper.rb
parent606b23dd39bc67b01a52bb189dd938fba87badd2 (diff)
downloadgitlab-ce-a6f3f6b8cd2e79acbc824c401435284635071e1a.tar.gz
extract favicon logic to lib class
Diffstat (limited to 'app/helpers/page_layout_helper.rb')
-rw-r--r--app/helpers/page_layout_helper.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/app/helpers/page_layout_helper.rb b/app/helpers/page_layout_helper.rb
index b9b0e08cde5..c3dd204181d 100644
--- a/app/helpers/page_layout_helper.rb
+++ b/app/helpers/page_layout_helper.rb
@@ -39,11 +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?
-
- 'favicon.ico'
+ Gitlab::Favicon.default
end
def page_image