diff options
| author | Phil Hughes <me@iamphill.com> | 2019-05-07 07:45:42 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-05-07 07:45:42 +0000 |
| commit | 06b06736eb314bf4144ae50400fbe9d8f8f3cae7 (patch) | |
| tree | e7db2052049b3cd9ed9a8c7d50616383ce58c5ef /lib | |
| parent | 2cbfd5c58cfcfe43dbaee3e6734bdf5fff9105b9 (diff) | |
| parent | fbac16b2de4b715a85dfd2b79768079d12229bc1 (diff) | |
| download | gitlab-ce-06b06736eb314bf4144ae50400fbe9d8f8f3cae7.tar.gz | |
Merge branch 'winh-separate-frontend-fixtures' into 'master'
Generate EE-specific JavaScript fixtures into ee/ directory (CE-backport)
See merge request gitlab-org/gitlab-ce!28032
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/gitlab.rb b/lib/gitlab.rb index d301efc3205..3f107fbbf3b 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 |