summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2017-06-27 12:49:50 +0100
committerLuke "Jared" Bennett <lbennett@gitlab.com>2017-06-27 12:49:50 +0100
commited31624970323c13326c3bfc1e154fa4938c5a6d (patch)
treef87e181ad6e7e7560e414e47ac0cc0d9f9bd0ae1 /app/helpers
parentbe1b27960a46b8e0d658ce9f2579700824823f41 (diff)
downloadgitlab-ce-ed31624970323c13326c3bfc1e154fa4938c5a6d.tar.gz
Add temporary CANARY env vars to be set in Kubernetes-with-canary.gitlab-ci.yml and used in page_layout_helper.rb
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/page_layout_helper.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/helpers/page_layout_helper.rb b/app/helpers/page_layout_helper.rb
index 3286a92a8a7..7279d5fb2d4 100644
--- a/app/helpers/page_layout_helper.rb
+++ b/app/helpers/page_layout_helper.rb
@@ -35,7 +35,9 @@ module PageLayoutHelper
end
def favicon
- Rails.env.development? ? 'favicon-blue.ico' : 'favicon.ico'
+ return 'favicon-yellow.ico' if ENV['CANARY'] == 'true'
+ return 'favicon-blue.ico' if Rails.env.development?
+ 'favicon.ico'
end
def page_image