diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-14 00:15:31 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-14 00:15:31 +0300 |
| commit | 314ed8700b3dcc6a353abd6d68d75979dc191d37 (patch) | |
| tree | 8b23bbd39f6a783405e97f9baed741d7bd3e172a /config | |
| parent | bf0074fcef1463c2726805cdf0fe7bcb219fb2ae (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/settings.rb | 3 |
1 files changed, 1 insertions, 2 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 |