diff --git a/.rubocop_todo/layout/empty_lines_around_method_body.yml b/.rubocop_todo/layout/empty_lines_around_method_body.yml index 27b2ee60208..d3114c41e90 100644 --- a/.rubocop_todo/layout/empty_lines_around_method_body.yml +++ b/.rubocop_todo/layout/empty_lines_around_method_body.yml @@ -10,9 +10,7 @@ Layout/EmptyLinesAroundMethodBody: - 'app/services/members/destroy_service.rb' - 'ee/app/models/software_license.rb' - 'ee/lib/gitlab/elastic/helper.rb' - - 'ee/lib/remote_development/workspace_operations/reconcile/output/desired_config_generator.rb' - 'ee/spec/support/helpers/identity_verification_helpers.rb' - - 'ee/spec/support/shared_contexts/remote_development/remote_development_shared_contexts.rb' - 'lib/api/helpers/packages_helpers.rb' - 'lib/gitlab/background_migration/batched_migration_job.rb' - 'lib/gitlab/ci/project_config.rb' diff --git a/lib/gitlab/fp/settings/default_settings_parser.rb b/lib/gitlab/fp/settings/default_settings_parser.rb index edd105f5384..e5726c5b77f 100644 --- a/lib/gitlab/fp/settings/default_settings_parser.rb +++ b/lib/gitlab/fp/settings/default_settings_parser.rb @@ -61,6 +61,7 @@ module Gitlab mutually_dependent_settings:, default_setting_names: ) + # No blank line here (satisfies Layout/EmptyLinesAroundMethodBody) if (mutually_dependent_settings - default_setting_names).any? raise "Unknown mutually dependent setting(s): " \ diff --git a/spec/support/matchers/invoke_rop_steps.rb b/spec/support/matchers/invoke_rop_steps.rb index 6ff1886fca0..9c4724c1ddc 100644 --- a/spec/support/matchers/invoke_rop_steps.rb +++ b/spec/support/matchers/invoke_rop_steps.rb @@ -110,7 +110,6 @@ module InvokeRopSteps ok_results_for_steps:, context_passed_along_steps: ) - expected_rop_steps = [] rop_steps.each do |rop_step|