diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-14 15:23:12 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-14 15:23:12 +0300 |
| commit | 27d427e538fa9c7cb6ca39637660a63f24d7f2d8 (patch) | |
| tree | 49a97c9eff362c01f02b9ab478607a1d3942a9de | |
| parent | f06c3272a6b8751cadfef262da0ea06991469708 (diff) | |
Add latest changes from gitlab-org/gitlab@16-6-stable-ee
| -rw-r--r-- | config/settings.rb | 3 | ||||
| -rw-r--r-- | spec/fast_spec_helper.rb | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/config/settings.rb b/config/settings.rb index 3edbcc9b5ed..9abbbc11899 100644 --- a/config/settings.rb +++ b/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 diff --git a/spec/fast_spec_helper.rb b/spec/fast_spec_helper.rb index d03f8b18b3e..7ffab4554cf 100644 --- a/spec/fast_spec_helper.rb +++ b/spec/fast_spec_helper.rb @@ -8,7 +8,6 @@ end require_relative '../config/bundler_setup' -ENV['GITLAB_ENV'] = 'test' ENV['IN_MEMORY_APPLICATION_SETTINGS'] = 'true' require './spec/deprecation_warnings' |