diff --git a/.rubocop_todo/layout/space_inside_parens.yml b/.rubocop_todo/layout/space_inside_parens.yml index 869488975ee93bb5614589f348f6450c0d9c91a7..96cb5e4da1940c6ac7cd6788458c9ce72c1dbfeb 100644 --- a/.rubocop_todo/layout/space_inside_parens.yml +++ b/.rubocop_todo/layout/space_inside_parens.yml @@ -13,7 +13,6 @@ Layout/SpaceInsideParens: - 'spec/helpers/gitlab_script_tag_helper_spec.rb' - 'spec/helpers/tab_helper_spec.rb' - 'spec/initializers/carrierwave_s3_encryption_headers_patch_spec.rb' - - 'spec/initializers/rdoc_segfault_patch_spec.rb' - 'spec/lib/api/entities/snippet_spec.rb' - 'spec/lib/banzai/filter/references/alert_reference_filter_spec.rb' - 'spec/lib/banzai/filter/references/feature_flag_reference_filter_spec.rb' diff --git a/.rubocop_todo/rspec/feature_category.yml b/.rubocop_todo/rspec/feature_category.yml index 97233bcbb1fb7b010c97453e6b38feb40076f881..b342a29b9c29bc1b27822d157d537907da99eb0d 100644 --- a/.rubocop_todo/rspec/feature_category.yml +++ b/.rubocop_todo/rspec/feature_category.yml @@ -2457,7 +2457,6 @@ RSpec/FeatureCategory: - 'spec/initializers/rack_multipart_patch_spec.rb' - 'spec/initializers/rails_asset_host_spec.rb' - 'spec/initializers/rails_yaml_safe_load_spec.rb' - - 'spec/initializers/rdoc_segfault_patch_spec.rb' - 'spec/initializers/remove_active_job_execute_callback_spec.rb' - 'spec/initializers/rest-client-hostname_override_spec.rb' - 'spec/initializers/sawyer_patch_spec.rb' diff --git a/.rubocop_todo/style/class_and_module_children.yml b/.rubocop_todo/style/class_and_module_children.yml index 810beef953d3311f0e764607ada6497d24e29ad6..c1b84b52112a4e19962d381cd9d573d3f10909b8 100644 --- a/.rubocop_todo/style/class_and_module_children.yml +++ b/.rubocop_todo/style/class_and_module_children.yml @@ -333,7 +333,6 @@ Style/ClassAndModuleChildren: - 'config/initializers/omniauth.rb' - 'config/initializers/postgres_cte_as_materialized.rb' - 'config/initializers/postgresql_cte.rb' - - 'config/initializers/rdoc_segfault_patch.rb' - 'config/initializers/zz_metrics.rb' - 'ee/app/controllers/admin/audit_log_reports_controller.rb' - 'ee/app/controllers/admin/audit_logs_controller.rb' diff --git a/config/initializers/rdoc_segfault_patch.rb b/config/initializers/rdoc_segfault_patch.rb deleted file mode 100644 index 2494d7ef421504453912aa65410777d519783386..0000000000000000000000000000000000000000 --- a/config/initializers/rdoc_segfault_patch.rb +++ /dev/null @@ -1,21 +0,0 @@ -# frozen_string_literal: true - -# Monkey patch of RDoc to prevent Ruby segfault due to -# stack buffer overflow Ruby bug - -# https://bugs.ruby-lang.org/issues/16376 -# -# Safe to remove once GitLab upgrades to Ruby 3.0 -# or once the fix is backported to 2.7.x and -# GitLab upgrades. -# https://gitlab.com/gitlab-org/gitlab/-/issues/351179 -class RDoc::Markup::ToHtml - def parseable?(_) - false - end -end - -class RDoc::Markup::Verbatim - def ruby? - false - end -end diff --git a/gems/gitlab-utils/spec/gitlab/utils/system_spec.rb b/gems/gitlab-utils/spec/gitlab/utils/system_spec.rb index 6d4f3bf039cd96f5226dcb0d16cc7c074fb4135f..74da4fa357117348502fcce2ee86ee6921b36cd4 100644 --- a/gems/gitlab-utils/spec/gitlab/utils/system_spec.rb +++ b/gems/gitlab-utils/spec/gitlab/utils/system_spec.rb @@ -227,13 +227,13 @@ describe '.summary' do it 'contains a selection of the available fields' do - stub_const('RUBY_DESCRIPTION', 'ruby-3.0-patch1') + stub_const('RUBY_DESCRIPTION', 'ruby-3.2-patch1') mock_existing_proc_file('/proc/self/status', proc_status) mock_existing_proc_file('/proc/self/smaps_rollup', proc_smaps_rollup) summary = described_class.summary - expect(summary[:version]).to eq('ruby-3.0-patch1') + expect(summary[:version]).to eq('ruby-3.2-patch1') expect(summary[:gc_stat].keys).to eq(GC.stat.keys) expect(summary[:memory_rss]).to eq(2527232) expect(summary[:memory_uss]).to eq(475136) diff --git a/spec/initializers/rdoc_segfault_patch_spec.rb b/spec/initializers/rdoc_segfault_patch_spec.rb deleted file mode 100644 index f9630295052735f5f69babd1580210764c3ddd7a..0000000000000000000000000000000000000000 --- a/spec/initializers/rdoc_segfault_patch_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -RSpec.describe 'RDoc segfault patch fix' do - describe 'RDoc::Markup::ToHtml' do - describe '#parseable?' do - it 'returns false' do - to_html = RDoc::Markup::ToHtml.new( nil) - - expect(to_html.parseable?('"def foo; end"')).to eq(false) - end - end - end - - describe 'RDoc::Markup::Verbatim' do - describe 'ruby?' do - it 'returns false' do - verbatim = RDoc::Markup::Verbatim.new('def foo; end') - verbatim.format = :ruby - - expect(verbatim.ruby?).to eq(false) - end - end - end -end diff --git a/spec/support/rspec_order_todo.yml b/spec/support/rspec_order_todo.yml index 2b8d402caa003f379899ed273a603e38078fd86c..d257d87874de75155ac67e012b953f501aa185a4 100644 --- a/spec/support/rspec_order_todo.yml +++ b/spec/support/rspec_order_todo.yml @@ -4800,7 +4800,6 @@ - './spec/initializers/pages_storage_check_spec.rb' - './spec/initializers/rack_multipart_patch_spec.rb' - './spec/initializers/rails_asset_host_spec.rb' -- './spec/initializers/rdoc_segfault_patch_spec.rb' - './spec/initializers/remove_active_job_execute_callback_spec.rb' - './spec/initializers/rest-client-hostname_override_spec.rb' - './spec/initializers/secret_token_spec.rb'