diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-21 02:50:22 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-21 02:50:22 +0300 |
commit | 9dc93a4519d9d5d7be48ff274127136236a3adb3 (patch) | |
tree | 70467ae3692a0e35e5ea56bcb803eb512a10bedb /lib/gitlab.rb | |
parent | 4b0f34b6d759d6299322b3a54453e930c6121ff0 (diff) |
Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43
Diffstat (limited to 'lib/gitlab.rb')
-rw-r--r-- | lib/gitlab.rb | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/lib/gitlab.rb b/lib/gitlab.rb index 11ecfb951aa..ddf08c8dc20 100644 --- a/lib/gitlab.rb +++ b/lib/gitlab.rb @@ -108,10 +108,21 @@ module Gitlab !%w[true 1].include?(ENV['FOSS_ONLY'].to_s) end + def self.jh? + @is_jh ||= + ee? && + root.join('jh').exist? && + !%w[true 1].include?(ENV['EE_ONLY'].to_s) + end + def self.ee yield if ee? end + def self.jh + yield if jh? + end + def self.http_proxy_env? HTTP_PROXY_ENV_VARS.any? { |name| ENV[name] } end |