Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-07 15:06:21 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-07 15:06:21 +0300
commit84a0e65ac88c7a3db86a0e4347606ba093490bef (patch)
tree860de954548b509e92f6f95a66c8c75cf389efb0 /lib/gitlab.rb
parentbf3d94a7332ff411b654137a1d1288c399fceba4 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab.rb')
-rw-r--r--lib/gitlab.rb12
1 files changed, 12 insertions, 0 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