From 84d1bd786125c1c14a3ba5f63e38a4cc736a9027 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 16 Jan 2024 10:42:19 +0000 Subject: Add latest changes from gitlab-org/gitlab@16-8-stable-ee --- config/initializers/rspec_profiling.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'config/initializers/rspec_profiling.rb') diff --git a/config/initializers/rspec_profiling.rb b/config/initializers/rspec_profiling.rb index 5830a3d5af2..c5285dc389b 100644 --- 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 @@ module RspecProfilingExt 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 -- cgit v1.2.3