summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWinnie Hellmann <winnie@gitlab.com>2019-04-25 11:47:31 +0200
committerWinnie Hellmann <winnie@gitlab.com>2019-05-02 23:11:17 +0200
commit78edcc2678d2914f50e20d44ec0e50f2aab0a727 (patch)
tree7a334796b8094a21c1d774dea3d4da438307c878
parent5990d42253b2b99dc5a699df81f0e0f976844c49 (diff)
downloadgitlab-ce-78edcc2678d2914f50e20d44ec0e50f2aab0a727.tar.gz
Allow to override Gitlab.ee? with IS_GITLAB_EE
(cherry picked from commit f3b74d59865a88be67663339447667c725961413)
-rw-r--r--lib/gitlab.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/gitlab.rb b/lib/gitlab.rb
index 1204e53ee2e..2a232c7e604 100644
--- a/lib/gitlab.rb
+++ b/lib/gitlab.rb
@@ -59,7 +59,11 @@ module Gitlab
end
def self.ee?
- Object.const_defined?(:License)
+ if ENV['IS_GITLAB_EE'].present?
+ Gitlab::Utils.to_boolean(ENV['IS_GITLAB_EE'])
+ else
+ Object.const_defined?(:License)
+ end
end
def self.process_name