diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-20 18:19:03 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-20 18:19:03 +0300 |
| commit | 14bd84b61276ef29b97d23642d698de769bacfd2 (patch) | |
| tree | f9eba90140c1bd874211dea17750a0d422c04080 /config/initializers_before_autoloader | |
| parent | 891c388697b2db0d8ee0c8358a9bdbf6dc56d581 (diff) | |
Add latest changes from gitlab-org/gitlab@15-10-stable-eev15.10.0-rc42
Diffstat (limited to 'config/initializers_before_autoloader')
| -rw-r--r-- | config/initializers_before_autoloader/001_fast_gettext.rb | 1 | ||||
| -rw-r--r-- | config/initializers_before_autoloader/004_zeitwerk.rb | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers_before_autoloader/001_fast_gettext.rb b/config/initializers_before_autoloader/001_fast_gettext.rb index 3d54ed8f32f..01aec95ce53 100644 --- a/config/initializers_before_autoloader/001_fast_gettext.rb +++ b/config/initializers_before_autoloader/001_fast_gettext.rb @@ -1,5 +1,6 @@ # frozen_string_literal: true require_relative '../../lib/gitlab/i18n' +require_relative '../../lib/gitlab/i18n/pluralization' Gitlab::I18n.setup(domain: 'gitlab', default_locale: :en) diff --git a/config/initializers_before_autoloader/004_zeitwerk.rb b/config/initializers_before_autoloader/004_zeitwerk.rb index 8b3cdf1a80c..72e471d25f2 100644 --- a/config/initializers_before_autoloader/004_zeitwerk.rb +++ b/config/initializers_before_autoloader/004_zeitwerk.rb @@ -65,7 +65,6 @@ Rails.autoloaders.each do |autoloader| 'function_uri' => 'FunctionURI', 'uuid' => 'UUID', 'occurrence_uuid' => 'OccurrenceUUID', - 'vulnerability_uuid' => 'VulnerabilityUUID', - 'vs_code_extension_activity_unique_counter' => 'VSCodeExtensionActivityUniqueCounter' + 'vulnerability_uuid' => 'VulnerabilityUUID' ) end |