diff options
| author | Jeremy Watson <jwatson@gitlab.com> | 2019-08-21 10:43:30 -0400 |
|---|---|---|
| committer | Jeremy Watson <jwatson@gitlab.com> | 2019-08-21 10:43:30 -0400 |
| commit | aec4ce4ac538992ae09c8a9c77be62a22ea239f1 (patch) | |
| tree | 0ec040a1d020a0096f60f1363db7fd1751967e9c /lib/gitlab.rb | |
| parent | ad799726ae697d12664b8c3903e8297e7bfb4088 (diff) | |
| parent | ef0f1509dd2a2a3ba5798362e2be21108b705a85 (diff) | |
| download | gitlab-ce-docs-group-managed-accounts.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into docs-group-managed-accountsdocs-group-managed-accounts
Diffstat (limited to 'lib/gitlab.rb')
| -rw-r--r-- | lib/gitlab.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab.rb b/lib/gitlab.rb index c62d1071dba..d9d8dcf7900 100644 --- a/lib/gitlab.rb +++ b/lib/gitlab.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require_dependency File.expand_path('gitlab/popen', __dir__) +require 'pathname' module Gitlab def self.root @@ -61,7 +61,7 @@ module Gitlab def self.ee? @is_ee ||= - if ENV['IS_GITLAB_EE'].present? + if ENV['IS_GITLAB_EE'] && !ENV['IS_GITLAB_EE'].empty? Gitlab::Utils.to_boolean(ENV['IS_GITLAB_EE']) else # We may use this method when the Rails environment is not loaded. This |