diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-20 13:43:29 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-20 13:43:29 +0300 |
| commit | 3b1af5cc7ed2666ff18b718ce5d30fa5a2756674 (patch) | |
| tree | 3bc4a40e0ee51ec27eabf917c537033c0c5b14d4 /config/initializers_before_autoloader | |
| parent | 9bba14be3f2c211bf79e15769cd9b77bc73a13bc (diff) | |
Add latest changes from gitlab-org/gitlab@16-1-stable-eev16.1.0-rc42
Diffstat (limited to 'config/initializers_before_autoloader')
3 files changed, 2 insertions, 21 deletions
diff --git a/config/initializers_before_autoloader/000_inflections.rb b/config/initializers_before_autoloader/000_inflections.rb index 2bf98a38544..41ffa454b4f 100644 --- a/config/initializers_before_autoloader/000_inflections.rb +++ b/config/initializers_before_autoloader/000_inflections.rb @@ -19,6 +19,7 @@ ActiveSupport::Inflector.inflections do |inflect| container_repository_registry dependency_proxy_blob_registry design_registry + design_management_repository_registry dependency_proxy_manifest_registry event_log file_registry diff --git a/config/initializers_before_autoloader/003_gc_compact.rb b/config/initializers_before_autoloader/003_gc_compact.rb deleted file mode 100644 index 6b5d49d79ab..00000000000 --- a/config/initializers_before_autoloader/003_gc_compact.rb +++ /dev/null @@ -1,21 +0,0 @@ -# frozen_string_literal: true - -# Be sure to restart your server when you modify this file. -# -# Disables `GC.compact` method via monkey-patching. -# This is temporary measure to deal with reguarly appearing compacting issues (resulting in segfaults) in external gems. -# Having this patch allow using `nakayoshi_fork` in `config/puma.rb`, -# only without `GC.compact` (still invoking 4 GC cycles). -# Refer to for details: https://github.com/puma/puma/blob/80274413b04fae77cac7a7fecab7d6e89204343b/lib/puma/util.rb#L27 - -# rubocop:disable Rails/Output -module NakayoshiForkCompacting - module MonkeyPatch - def compact - puts 'Note: GC compacting is currently disabled.'\ - ' Refer to `config/initializers_before_autoloader/003_gc_compact.rb` for details.' - end - end -end - -GC.singleton_class.prepend NakayoshiForkCompacting::MonkeyPatch diff --git a/config/initializers_before_autoloader/004_zeitwerk.rb b/config/initializers_before_autoloader/004_zeitwerk.rb index 72e471d25f2..2d54ab87dca 100644 --- a/config/initializers_before_autoloader/004_zeitwerk.rb +++ b/config/initializers_before_autoloader/004_zeitwerk.rb @@ -41,6 +41,7 @@ Rails.autoloaders.each do |autoloader| 'chunked_io' => 'ChunkedIO', 'http_io' => 'HttpIO', 'jetbrains_plugin_activity_unique_counter' => 'JetBrainsPluginActivityUniqueCounter', + 'jetbrains_bundled_plugin_activity_unique_counter' => 'JetBrainsBundledPluginActivityUniqueCounter', 'json_formatter' => 'JSONFormatter', 'json_web_token' => 'JSONWebToken', 'as_json' => 'AsJSON', |