Merge branch 'make-is-gitlab-ee-consistent' into 'master'

Make IS_GITLAB_EE consistent

See merge request !18442

config/helpers/is_ee_env.js

@@ -3,7 +3,12 @@ const path = require('path');
 
 const ROOT_PATH = path.resolve(__dirname, '../..');
 
+// The `IS_GITLAB_EE` is always `string` or `nil`
+// Thus the nil or empty string will result
+// in using default value: true
+//
+// The behavior needs to be synchronised with
+// lib/gitlab.rb: Gitlab.ee?
 module.exports =
-  process.env.IS_GITLAB_EE !== undefined
-    ? JSON.parse(process.env.IS_GITLAB_EE)
-    : fs.existsSync(path.join(ROOT_PATH, 'ee'));
+  fs.existsSync(path.join(ROOT_PATH, 'ee', 'app', 'models', 'license.rb')) &&
+  (!process.env.IS_GITLAB_EE || JSON.parse(process.env.IS_GITLAB_EE));

lib/gitlab.rb

@@ -65,14 +65,18 @@ def self.dev_env_or_com?
 
   def self.ee?
     @is_ee ||=
-      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
-        # means that checking the presence of the License class could result in
-        # this method returning `false`, even for an EE installation.
-        root.join('ee/app/models/license.rb').exist?
-      end
+      # We use this method when the Rails environment is not loaded. This
+      # means that checking the presence of the License class could result in
+      # this method returning `false`, even for an EE installation.
+      #
+      # The `IS_GITLAB_EE` is always `string` or `nil`
+      # Thus the nil or empty string will result
+      # in using default value: true
+      #
+      # The behavior needs to be synchronised with
+      # config/helpers/is_ee_env.js
+      root.join('ee/app/models/license.rb').exist? &&
+        (ENV['IS_GITLAB_EE'].to_s.empty? || Gitlab::Utils.to_boolean(ENV['IS_GITLAB_EE']))
   end
 
   def self.ee