diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-07 15:06:21 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-07 15:06:21 +0300 |
commit | 84a0e65ac88c7a3db86a0e4347606ba093490bef (patch) | |
tree | 860de954548b509e92f6f95a66c8c75cf389efb0 /lib | |
parent | bf3d94a7332ff411b654137a1d1288c399fceba4 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab.rb | 12 | ||||
-rw-r--r-- | lib/gitlab/favicon.rb | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/lib/gitlab.rb b/lib/gitlab.rb index ad8e693ccbc..0e6db54eb46 100644 --- a/lib/gitlab.rb +++ b/lib/gitlab.rb @@ -47,6 +47,18 @@ module Gitlab Gitlab.config.gitlab.url == COM_URL || gl_subdomain? end + def self.canary? + Gitlab::Utils.to_boolean(ENV['CANARY']) + end + + def self.com_and_canary? + com? && canary? + end + + def self.com_but_not_canary? + com? && !canary? + end + def self.org? Gitlab.config.gitlab.url == 'https://dev.gitlab.org' end diff --git a/lib/gitlab/favicon.rb b/lib/gitlab/favicon.rb index b5d308e462c..ce1370bab0f 100644 --- a/lib/gitlab/favicon.rb +++ b/lib/gitlab/favicon.rb @@ -7,7 +7,7 @@ module Gitlab image_name = if appearance.favicon.exists? appearance.favicon_path - elsif Gitlab::Utils.to_boolean(ENV['CANARY']) + elsif Gitlab.canary? 'favicon-yellow.png' elsif Rails.env.development? development_favicon |