Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42

1 files changed, 8 insertions, 2 deletions

diff --git a/lib/gitlab_edition.rb b/lib/gitlab_edition.rb
index 6eb6b52c357..02006148a34 100644
--- a/lib/gitlab_edition.rb
+++ b/lib/gitlab_edition.rb
@@ -18,7 +18,11 @@ module GitlabEdition
   end
 
   def self.ee?
-    @is_ee ||=
+    # To reduce dependencies in QA image we are not using
+    # `Gitlab::Utils::StrongMemoize` but reimplementing its functionality.
+    return @is_ee if defined?(@is_ee)
+
+    @is_ee =
       # 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.
@@ -34,7 +38,9 @@ module GitlabEdition
   end
 
   def self.jh?
-    @is_jh ||=
+    return @is_jh if defined?(@is_jh)
+
+    @is_jh =
       ee? &&
         root.join('jh').exist? &&
         !%w[true 1].include?(ENV['EE_ONLY'].to_s)