Add latest changes from gitlab-org/security/gitlab@16-7-stable-ee

gitlabhq · Jan 24, 2024 · da26596 · da26596
1 parent 53aca67
commit da26596
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/config/initializers/rspec_profiling.rb b/config/initializers/rspec_profiling.rb
@@ -2,6 +2,8 @@
 
 return unless Rails.env.test?
 
+require 'gitlab_edition'
+
 module RspecProfilingExt
   module Collectors
     class CSVWithTimestamps < ::RspecProfiling::Collectors::CSV
@@ -30,7 +32,7 @@ def output
   module Git
     def branch
       if ENV['CI_COMMIT_REF_NAME']
-        "#{defined?(Gitlab::License) ? 'ee' : 'ce'}:#{ENV['CI_COMMIT_REF_NAME']}"
+        "#{GitlabEdition.ee? ? 'ee' : 'ce'}:#{ENV['CI_COMMIT_REF_NAME']}"
       else
         super&.chomp
       end

diff --git a/spec/support/helpers/stub_configuration.rb b/spec/support/helpers/stub_configuration.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'gitlab_edition'
 require 'active_support/hash_with_indifferent_access'
 require 'active_support/dependencies'
 
@@ -194,6 +195,6 @@ def to_settings(hash)
 end
 
 require_relative '../../../ee/spec/support/helpers/ee/stub_configuration' if
-  Dir.exist?("#{__dir__}/../../../ee")
+  GitlabEdition.ee?
 
 StubConfiguration.prepend_mod_with('StubConfiguration')