diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2019-07-22 17:11:50 +0200 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-07-29 13:53:20 +0200 |
| commit | d7a4c1d2a5f395ca6ddb2dc2608ac33ccebf8a74 (patch) | |
| tree | 0876a512726d727087c72e045866cc5aca01fe42 /lib/gitlab.rb | |
| parent | ca05130319ae9d74ee7771b5a8adb6cf25857fb7 (diff) | |
| download | gitlab-ce-resolve-scripts-differences.tar.gz | |
Backport EE changes made to the scripts/ directoryresolve-scripts-differences
This backport changes made by EE to the files in the scripts/ directory.
This comes with a few changes to some scripts to make them work in the
single codebase setup.
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 |