diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-16 15:07:53 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-16 15:07:53 +0000 |
| commit | c1f98d9590def61ad2fca09cc06a7a9d52cdebc5 (patch) | |
| tree | 84490eecee06513f152cd466ed7c1d23a71a6ddf /config/initializers | |
| parent | 12166c0faf75479889bc0ac432b85b9dae91552b (diff) | |
| download | gitlab-ce-c1f98d9590def61ad2fca09cc06a7a9d52cdebc5.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/1_settings.rb | 2 | ||||
| -rw-r--r-- | config/initializers/9_fast_gettext.rb | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 1927d15d72b..7f615370a90 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -903,6 +903,8 @@ Settings['repositories'] ||= Settingslogic.new({}) Settings.repositories['storages'] ||= {} Settings.repositories.storages.each do |key, storage| + next if Settings.repositories.storages[key].is_a?(Gitlab::GitalyClient::StorageSettings) + Settings.repositories.storages[key] = Gitlab::GitalyClient::StorageSettings.new(storage) end diff --git a/config/initializers/9_fast_gettext.rb b/config/initializers/9_fast_gettext.rb deleted file mode 100644 index 0c28a1b7ce8..00000000000 --- a/config/initializers/9_fast_gettext.rb +++ /dev/null @@ -1,4 +0,0 @@ -# frozen_string_literal: true - -FastGettext.default_available_locales = Gitlab::I18n.available_locales -I18n.available_locales = Gitlab::I18n.available_locales |