diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-29 11:54:15 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-29 11:54:15 +0300 |
| commit | 4fc3a39c6237651f3a35c286eac61118a3700262 (patch) | |
| tree | 967f22328d271b7d66871c06e2499d86c9434430 /app/helpers | |
| parent | 89a3572bfe15c5a627c7f5646a997179e686ee27 (diff) | |
| parent | 7a36fd106fd3041ef77a18fff971344fbdab7e7d (diff) | |
Merge branch 'add-canary-favicon' into 'master'
Add canary favicon
See merge request gitlab-org/gitlab-ce!12477
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/page_layout_helper.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/helpers/page_layout_helper.rb b/app/helpers/page_layout_helper.rb index 18b9bf214a3..a8397b03d63 100644 --- a/app/helpers/page_layout_helper.rb +++ b/app/helpers/page_layout_helper.rb @@ -39,7 +39,10 @@ module PageLayoutHelper end def favicon - Rails.env.development? ? 'favicon-blue.ico' : 'favicon.ico' + return 'favicon-yellow.ico' if Gitlab::Utils.to_boolean(ENV['CANARY']) + return 'favicon-blue.ico' if Rails.env.development? + + 'favicon.ico' end def page_image |