diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-05-08 14:56:53 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-05-08 14:56:53 -0500 |
| commit | 2f003b58645b3cbc987c240f844b1ff6eb0c026a (patch) | |
| tree | 07c2087939b6c6dce33620c57a6989d76547e681 /lib/gitlab.rb | |
| parent | 204dca4436f5b2c82611a873d05186ec4ff4c17c (diff) | |
| parent | 2084301b4ec863d65638cc0c30c124cb5fe4b3d8 (diff) | |
| download | gitlab-ce-11-11-stable-prepare-rc2.tar.gz | |
Merge branch 'rs-pre-freeze' into 11-11-stable-prepare-rc211-11-stable-prepare-rc2
Diffstat (limited to 'lib/gitlab.rb')
| -rw-r--r-- | lib/gitlab.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/gitlab.rb b/lib/gitlab.rb index 1204e53ee2e..3f107fbbf3b 100644 --- a/lib/gitlab.rb +++ b/lib/gitlab.rb @@ -36,8 +36,8 @@ module Gitlab end COM_URL = 'https://gitlab.com'.freeze - APP_DIRS_PATTERN = %r{^/?(app|config|ee|lib|spec|\(\w*\))} - SUBDOMAIN_REGEX = %r{\Ahttps://[a-z0-9]+\.gitlab\.com\z} + APP_DIRS_PATTERN = %r{^/?(app|config|ee|lib|spec|\(\w*\))}.freeze + SUBDOMAIN_REGEX = %r{\Ahttps://[a-z0-9]+\.gitlab\.com\z}.freeze VERSION = File.read(root.join("VERSION")).strip.freeze INSTALLATION_TYPE = File.read(root.join("INSTALLATION_TYPE")).strip.freeze @@ -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 |