Merge branch 'fix-broken-master' into 'master'

ci: Fix broken master by not reading GITLAB_ENV

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136760



Merged-by: Stan Hu <stanhu@gmail.com>
Approved-by: Stan Hu <stanhu@gmail.com>
Co-authored-by: Rémy Coutable <remy@rymai.me>

config/settings.rb

@@ -3,11 +3,10 @@
 require_relative '../lib/gitlab_settings'
 
 file = ENV.fetch('GITLAB_CONFIG') { Rails.root.join('config/gitlab.yml') }
-section = ENV.fetch('GITLAB_ENV') { Rails.env }
 
 GITLAB_INSTANCE_UUID_NOT_SET = 'uuid-not-set'
 
-Settings = GitlabSettings.load(file, section) do
+Settings = GitlabSettings.load(file, Rails.env) do
   def gitlab_on_standard_port?
     on_standard_port?(gitlab)
   end

spec/fast_spec_helper.rb

@@ -8,7 +8,6 @@
 
 require_relative '../config/bundler_setup'
 
-ENV['GITLAB_ENV'] = 'test'
 ENV['IN_MEMORY_APPLICATION_SETTINGS'] = 'true'
 
 require './spec/deprecation_warnings'