diff --git a/.rubocop_todo/factory_bot/excessive_create_list.yml b/.rubocop_todo/factory_bot/excessive_create_list.yml index 62b53e08b9e..5f88e22c926 100644 --- a/.rubocop_todo/factory_bot/excessive_create_list.yml +++ b/.rubocop_todo/factory_bot/excessive_create_list.yml @@ -1,6 +1,5 @@ --- FactoryBot/ExcessiveCreateList: - Details: grace period Exclude: - 'ee/spec/controllers/groups/hooks_controller_spec.rb' - 'ee/spec/features/search/elastic/global_search_spec.rb' diff --git a/.rubocop_todo/gemspec/add_runtime_dependency.yml b/.rubocop_todo/gemspec/add_runtime_dependency.yml deleted file mode 100644 index 50bd80e5a6c..00000000000 --- a/.rubocop_todo/gemspec/add_runtime_dependency.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -# Cop supports --autocorrect. -Gemspec/AddRuntimeDependency: - Details: grace period diff --git a/.rubocop_todo/gitlab/avoid_current_organization.yml b/.rubocop_todo/gitlab/avoid_current_organization.yml index 85bb28dcdd2..d4b256117bc 100644 --- a/.rubocop_todo/gitlab/avoid_current_organization.yml +++ b/.rubocop_todo/gitlab/avoid_current_organization.yml @@ -1,5 +1,4 @@ --- Gitlab/AvoidCurrentOrganization: - Details: grace period Exclude: - 'lib/gitlab/github_gists_import/importer/gist_importer.rb' diff --git a/.rubocop_todo/gitlab/documentation_links/link.yml b/.rubocop_todo/gitlab/documentation_links/link.yml index c867c607312..2efd412f5c3 100644 --- a/.rubocop_todo/gitlab/documentation_links/link.yml +++ b/.rubocop_todo/gitlab/documentation_links/link.yml @@ -1,7 +1,6 @@ --- # Cop supports --autocorrect. Gitlab/DocumentationLinks/Link: - Details: grace period Exclude: - '**/*.haml' - 'app/helpers/releases_helper.rb' diff --git a/.rubocop_todo/gitlab/ee_only_class.yml b/.rubocop_todo/gitlab/ee_only_class.yml index 1c998d80cce..7ff29f83736 100644 --- a/.rubocop_todo/gitlab/ee_only_class.yml +++ b/.rubocop_todo/gitlab/ee_only_class.yml @@ -1,6 +1,5 @@ --- Gitlab/EeOnlyClass: - Details: grace period Exclude: - 'ee/app/controllers/concerns/ee/routable_actions/sso_enforcement_redirect.rb' - 'ee/app/graphql/ee/resolvers/pending_group_members_resolver.rb' diff --git a/.rubocop_todo/internal_affairs/cop_description_with_example.yml b/.rubocop_todo/internal_affairs/cop_description_with_example.yml deleted file mode 100644 index ac566aaa0af..00000000000 --- a/.rubocop_todo/internal_affairs/cop_description_with_example.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -# Cop supports --autocorrect. -InternalAffairs/CopDescriptionWithExample: - Details: grace period diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml index 2fde5173291..399f1bcb80a 100644 --- a/.rubocop_todo/layout/line_length.yml +++ b/.rubocop_todo/layout/line_length.yml @@ -137,20 +137,6 @@ Layout/LineLength: - 'app/models/ci/unit_test.rb' - 'app/models/clusters/agent.rb' - 'app/models/clusters/cluster.rb' - - 'app/models/commit_range.rb' - - 'app/models/commit_status.rb' - - 'app/models/concerns/analytics/cycle_analytics/stage_event_model.rb' - - 'app/models/concerns/avatarable.rb' - - 'app/models/concerns/bulk_insert_safe.rb' - - 'app/models/concerns/cache_markdown_field.rb' - - 'app/models/concerns/cacheable_attributes.rb' - - 'app/models/concerns/cascading_namespace_setting_attribute.rb' - - 'app/models/concerns/ci/has_status.rb' - - 'app/models/concerns/each_batch.rb' - - 'app/models/concerns/enums/ci/pipeline.rb' - - 'app/models/concerns/enums/vulnerability.rb' - - 'app/models/concerns/fast_destroy_all.rb' - - 'app/models/concerns/group_descendant.rb' - 'app/models/concerns/ignorable_columns.rb' - 'app/models/concerns/iid_routes.rb' - 'app/models/concerns/integrations/has_data_fields.rb' diff --git a/.rubocop_todo/lint/debugger.yml b/.rubocop_todo/lint/debugger.yml index 5e119ad03ca..3e7da83ff61 100644 --- a/.rubocop_todo/lint/debugger.yml +++ b/.rubocop_todo/lint/debugger.yml @@ -1,5 +1,4 @@ --- Lint/Debugger: - Details: grace period Exclude: - 'spec/support/helpers/docs_screenshot_helpers.rb' diff --git a/.rubocop_todo/lint/safe_navigation_consistency.yml b/.rubocop_todo/lint/safe_navigation_consistency.yml index a9da0a877d2..d9cdfcf4e83 100644 --- a/.rubocop_todo/lint/safe_navigation_consistency.yml +++ b/.rubocop_todo/lint/safe_navigation_consistency.yml @@ -1,7 +1,6 @@ --- # Cop supports --autocorrect. Lint/SafeNavigationConsistency: - Details: grace period Exclude: - 'app/models/concerns/ci/deployable.rb' - 'app/policies/packages/policies/dependency_proxy/group_policy.rb' diff --git a/.rubocop_todo/lint/void.yml b/.rubocop_todo/lint/void.yml index afb43b7e250..8630f92e63b 100644 --- a/.rubocop_todo/lint/void.yml +++ b/.rubocop_todo/lint/void.yml @@ -1,6 +1,5 @@ --- # Cop supports --autocorrect. Lint/Void: - Details: grace period Exclude: - 'spec/lib/gitlab/import_export/json/streaming_serializer_spec.rb' diff --git a/.rubocop_todo/rails/date.yml b/.rubocop_todo/rails/date.yml index c09e6ba71eb..0780b1872e7 100644 --- a/.rubocop_todo/rails/date.yml +++ b/.rubocop_todo/rails/date.yml @@ -1,7 +1,6 @@ --- # Cop supports --autocorrect. Rails/Date: - Details: grace period Exclude: - 'app/controllers/users_controller.rb' - 'app/finders/issues_finder.rb' diff --git a/.rubocop_todo/rails/enum_hash.yml b/.rubocop_todo/rails/enum_hash.yml index ffd8c06ad8e..fc384ad2f42 100644 --- a/.rubocop_todo/rails/enum_hash.yml +++ b/.rubocop_todo/rails/enum_hash.yml @@ -1,6 +1,5 @@ --- # Cop supports --autocorrect. Rails/EnumHash: - Details: grace period Exclude: - 'app/models/activity_pub/releases_subscription.rb' diff --git a/.rubocop_todo/rails/enum_syntax.yml b/.rubocop_todo/rails/enum_syntax.yml index 4874b07c4f7..4ee23b1543c 100644 --- a/.rubocop_todo/rails/enum_syntax.yml +++ b/.rubocop_todo/rails/enum_syntax.yml @@ -1,7 +1,6 @@ --- # Cop supports --autocorrect. Rails/EnumSyntax: - Details: grace period Exclude: - 'app/models/abuse_report.rb' - 'app/models/alert_management/alert.rb' diff --git a/.rubocop_todo/rails/pluralization_grammar.yml b/.rubocop_todo/rails/pluralization_grammar.yml index 53e9df01227..5fe067f1262 100644 --- a/.rubocop_todo/rails/pluralization_grammar.yml +++ b/.rubocop_todo/rails/pluralization_grammar.yml @@ -1,7 +1,6 @@ --- # Cop supports --autocorrect. Rails/PluralizationGrammar: - Details: grace period Exclude: - 'app/models/application_setting.rb' - 'app/models/application_setting_implementation.rb' diff --git a/.rubocop_todo/rails/where_range.yml b/.rubocop_todo/rails/where_range.yml index b897f1d5c95..eaa7b349046 100644 --- a/.rubocop_todo/rails/where_range.yml +++ b/.rubocop_todo/rails/where_range.yml @@ -1,7 +1,6 @@ --- # Cop supports --autocorrect. Rails/WhereRange: - Details: grace period Exclude: - 'app/finders/events_finder.rb' - 'app/finders/groups_finder.rb' diff --git a/.rubocop_todo/rspec/be_empty.yml b/.rubocop_todo/rspec/be_empty.yml index 64ea6a52b9d..1ac162c7e15 100644 --- a/.rubocop_todo/rspec/be_empty.yml +++ b/.rubocop_todo/rspec/be_empty.yml @@ -1,7 +1,6 @@ --- # Cop supports --autocorrect. RSpec/BeEmpty: - Details: grace period Exclude: - 'ee/spec/controllers/subscriptions/groups_controller_spec.rb' - 'ee/spec/finders/groups/users_finder_spec.rb' diff --git a/.rubocop_todo/rspec/be_eq.yml b/.rubocop_todo/rspec/be_eq.yml index 97797db1669..a6470c8c591 100644 --- a/.rubocop_todo/rspec/be_eq.yml +++ b/.rubocop_todo/rspec/be_eq.yml @@ -1,7 +1,6 @@ --- # Cop supports --autocorrect. RSpec/BeEq: - Details: grace period Exclude: - 'ee/spec/bin/custom_ability_spec.rb' - 'ee/spec/controllers/admin/application_settings_controller_spec.rb' diff --git a/.rubocop_todo/rspec/be_nil.yml b/.rubocop_todo/rspec/be_nil.yml index 82d00626347..6d3d51a8d30 100644 --- a/.rubocop_todo/rspec/be_nil.yml +++ b/.rubocop_todo/rspec/be_nil.yml @@ -1,7 +1,6 @@ --- # Cop supports --autocorrect. RSpec/BeNil: - Details: grace period Exclude: - 'ee/spec/controllers/projects_controller_spec.rb' - 'ee/spec/graphql/mutations/issues/set_weight_spec.rb' diff --git a/.rubocop_todo/rspec/contain_exactly.yml b/.rubocop_todo/rspec/contain_exactly.yml index 34635d33bcc..0ddfa6eb31f 100644 --- a/.rubocop_todo/rspec/contain_exactly.yml +++ b/.rubocop_todo/rspec/contain_exactly.yml @@ -1,7 +1,6 @@ --- # Cop supports --autocorrect. RSpec/ContainExactly: - Details: grace period Exclude: - 'ee/spec/controllers/operations_controller_spec.rb' - 'ee/spec/finders/billed_users_finder_spec.rb' diff --git a/.rubocop_todo/rspec/dialect.yml b/.rubocop_todo/rspec/dialect.yml index 4b3a90b443f..3140950b2d1 100644 --- a/.rubocop_todo/rspec/dialect.yml +++ b/.rubocop_todo/rspec/dialect.yml @@ -1,7 +1,6 @@ --- # Cop supports --autocorrect. RSpec/Dialect: - Details: grace period Exclude: - 'ee/spec/controllers/admin/application_settings_controller_spec.rb' - 'ee/spec/helpers/ee/personal_access_tokens_helper_spec.rb' diff --git a/.rubocop_todo/rspec/duplicated_metadata.yml b/.rubocop_todo/rspec/duplicated_metadata.yml deleted file mode 100644 index 32d62eb23c6..00000000000 --- a/.rubocop_todo/rspec/duplicated_metadata.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -# Cop supports --autocorrect. -RSpec/DuplicatedMetadata: - Details: grace period diff --git a/.rubocop_todo/rspec/empty_metadata.yml b/.rubocop_todo/rspec/empty_metadata.yml deleted file mode 100644 index a344b3d6e51..00000000000 --- a/.rubocop_todo/rspec/empty_metadata.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -# Cop supports --autocorrect. -RSpec/EmptyMetadata: - Details: grace period diff --git a/.rubocop_todo/rspec/empty_output.yml b/.rubocop_todo/rspec/empty_output.yml deleted file mode 100644 index 07c212b3220..00000000000 --- a/.rubocop_todo/rspec/empty_output.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -# Cop supports --autocorrect. -RSpec/EmptyOutput: - Details: grace period diff --git a/.rubocop_todo/rspec/eq.yml b/.rubocop_todo/rspec/eq.yml index 82e98b969f0..f43dcdc8a7c 100644 --- a/.rubocop_todo/rspec/eq.yml +++ b/.rubocop_todo/rspec/eq.yml @@ -1,7 +1,6 @@ --- # Cop supports --autocorrect. RSpec/Eq: - Details: grace period Exclude: - 'ee/spec/controllers/admin/application_settings_controller_spec.rb' - 'spec/controllers/projects/compare_controller_spec.rb' diff --git a/.rubocop_todo/rspec/example_without_description.yml b/.rubocop_todo/rspec/example_without_description.yml index 77c483db4eb..44ae7dc6868 100644 --- a/.rubocop_todo/rspec/example_without_description.yml +++ b/.rubocop_todo/rspec/example_without_description.yml @@ -1,6 +1,5 @@ --- RSpec/ExampleWithoutDescription: - Details: grace period Exclude: - 'ee/spec/bin/custom_ability_spec.rb' - 'ee/spec/components/gitlab_subscriptions/discover_duo_pro_component_spec.rb' diff --git a/.rubocop_todo/rspec/excessive_docstring_spacing.yml b/.rubocop_todo/rspec/excessive_docstring_spacing.yml index fd331f0df86..84f35ec2837 100644 --- a/.rubocop_todo/rspec/excessive_docstring_spacing.yml +++ b/.rubocop_todo/rspec/excessive_docstring_spacing.yml @@ -1,7 +1,6 @@ --- # Cop supports --autocorrect. RSpec/ExcessiveDocstringSpacing: - Details: grace period Exclude: - 'ee/spec/controllers/ee/groups/usage_quotas_controller_spec.rb' - 'ee/spec/features/gitlab_subscriptions/trials/duo_enterprise/creation_with_one_existing_namespace_flow_spec.rb' diff --git a/.rubocop_todo/rspec/expect_in_let.yml b/.rubocop_todo/rspec/expect_in_let.yml index 4a97b4b6deb..5f081e89035 100644 --- a/.rubocop_todo/rspec/expect_in_let.yml +++ b/.rubocop_todo/rspec/expect_in_let.yml @@ -1,6 +1,5 @@ --- RSpec/ExpectInLet: - Details: grace period Exclude: - 'ee/spec/models/elasticsearch_indexed_namespace_spec.rb' - 'ee/spec/models/elasticsearch_indexed_project_spec.rb' diff --git a/.rubocop_todo/rspec/identical_equality_assertion.yml b/.rubocop_todo/rspec/identical_equality_assertion.yml index 81f48d3b75c..9518ff52d94 100644 --- a/.rubocop_todo/rspec/identical_equality_assertion.yml +++ b/.rubocop_todo/rspec/identical_equality_assertion.yml @@ -1,6 +1,5 @@ --- RSpec/IdenticalEqualityAssertion: - Details: grace period Exclude: - 'ee/spec/lib/gitlab/ci/reports/license_scanning/license_spec.rb' - 'ee/spec/lib/gitlab/elastic/document_reference_spec.rb' diff --git a/.rubocop_todo/rspec/is_expected_specify.yml b/.rubocop_todo/rspec/is_expected_specify.yml index 23ae910f9ae..204f21c4eef 100644 --- a/.rubocop_todo/rspec/is_expected_specify.yml +++ b/.rubocop_todo/rspec/is_expected_specify.yml @@ -1,7 +1,6 @@ --- # Cop supports --autocorrect. RSpec/IsExpectedSpecify: - Details: grace period Exclude: - 'ee/spec/controllers/groups/analytics/repository_analytics_controller_spec.rb' - 'ee/spec/graphql/ee/types/branch_protection_type_spec.rb' diff --git a/.rubocop_todo/rspec/missing_expectation_target_method.yml b/.rubocop_todo/rspec/missing_expectation_target_method.yml index 40fbd9911c0..da0b209d31f 100644 --- a/.rubocop_todo/rspec/missing_expectation_target_method.yml +++ b/.rubocop_todo/rspec/missing_expectation_target_method.yml @@ -1,6 +1,5 @@ --- RSpec/MissingExpectationTargetMethod: - Details: grace period Exclude: - 'ee/spec/lib/ee/gitlab/ci/pipeline/chain/validate/external_spec.rb' - 'spec/config/object_store_settings_spec.rb' diff --git a/.rubocop_todo/rspec/no_expectation_example.yml b/.rubocop_todo/rspec/no_expectation_example.yml index e3f83c39a97..50ec95a94eb 100644 --- a/.rubocop_todo/rspec/no_expectation_example.yml +++ b/.rubocop_todo/rspec/no_expectation_example.yml @@ -1,6 +1,5 @@ --- RSpec/NoExpectationExample: - Details: grace period Exclude: - 'ee/spec/components/gitlab_subscriptions/discover_duo_pro_component_spec.rb' - 'ee/spec/features/billings/billing_plans_spec.rb' diff --git a/.rubocop_todo/rspec/pending_without_reason.yml b/.rubocop_todo/rspec/pending_without_reason.yml index d83b4ec56c8..fb12dcfe665 100644 --- a/.rubocop_todo/rspec/pending_without_reason.yml +++ b/.rubocop_todo/rspec/pending_without_reason.yml @@ -1,6 +1,5 @@ --- RSpec/PendingWithoutReason: - Details: grace period Exclude: - 'ee/spec/controllers/operations_controller_spec.rb' - 'ee/spec/features/merge_request/user_approves_spec.rb' diff --git a/.rubocop_todo/rspec/receive_messages.yml b/.rubocop_todo/rspec/receive_messages.yml index 4bd8cd2c9ea..b41fab7ee56 100644 --- a/.rubocop_todo/rspec/receive_messages.yml +++ b/.rubocop_todo/rspec/receive_messages.yml @@ -1,7 +1,6 @@ --- # Cop supports --autocorrect. RSpec/ReceiveMessages: - Details: grace period Exclude: - 'ee/spec/bin/custom_ability_spec.rb' - 'ee/spec/components/namespaces/storage/limit_alert_component_spec.rb' diff --git a/.rubocop_todo/rspec/redundant_around.yml b/.rubocop_todo/rspec/redundant_around.yml index 262fbc0dce0..7966acaabb4 100644 --- a/.rubocop_todo/rspec/redundant_around.yml +++ b/.rubocop_todo/rspec/redundant_around.yml @@ -1,6 +1,5 @@ --- # Cop supports --autocorrect. RSpec/RedundantAround: - Details: grace period Exclude: - 'spec/spec_helper.rb' diff --git a/.rubocop_todo/rspec/redundant_predicate_matcher.yml b/.rubocop_todo/rspec/redundant_predicate_matcher.yml index 7ed5415164c..95261daefc7 100644 --- a/.rubocop_todo/rspec/redundant_predicate_matcher.yml +++ b/.rubocop_todo/rspec/redundant_predicate_matcher.yml @@ -1,7 +1,6 @@ --- # Cop supports --autocorrect. RSpec/RedundantPredicateMatcher: - Details: grace period Exclude: - 'ee/spec/lib/gitlab/ci/templates/api_fuzzing_gitlab_ci_yaml_spec.rb' - 'ee/spec/lib/gitlab/ci/templates/api_fuzzing_latest_gitlab_ci_yaml_spec.rb' diff --git a/.rubocop_todo/rspec/remove_const.yml b/.rubocop_todo/rspec/remove_const.yml index d37d274f402..cd1e1f54882 100644 --- a/.rubocop_todo/rspec/remove_const.yml +++ b/.rubocop_todo/rspec/remove_const.yml @@ -1,5 +1,4 @@ --- RSpec/RemoveConst: - Details: grace period Exclude: - 'spec/support/helpers/click_house_schema_helpers.rb' diff --git a/.rubocop_todo/rspec/repeated_subject_call.yml b/.rubocop_todo/rspec/repeated_subject_call.yml index bbc80a8b2e5..91e610314d7 100644 --- a/.rubocop_todo/rspec/repeated_subject_call.yml +++ b/.rubocop_todo/rspec/repeated_subject_call.yml @@ -1,6 +1,5 @@ --- RSpec/RepeatedSubjectCall: - Details: grace period Exclude: - 'ee/spec/controllers/projects/settings/repository_controller_spec.rb' - 'ee/spec/controllers/registrations/groups_controller_spec.rb' diff --git a/.rubocop_todo/rspec/skip_block_inside_example.yml b/.rubocop_todo/rspec/skip_block_inside_example.yml deleted file mode 100644 index adb2ca7c0d1..00000000000 --- a/.rubocop_todo/rspec/skip_block_inside_example.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -RSpec/SkipBlockInsideExample: - Details: grace period diff --git a/.rubocop_todo/rspec/spec_file_path_format.yml b/.rubocop_todo/rspec/spec_file_path_format.yml index dccd529167e..a4b5956a423 100644 --- a/.rubocop_todo/rspec/spec_file_path_format.yml +++ b/.rubocop_todo/rspec/spec_file_path_format.yml @@ -1,6 +1,5 @@ --- RSpec/SpecFilePathFormat: - Details: grace period Exclude: - 'ee/spec/models/merge_request/blocking_spec.rb' - 'ee/spec/requests/api/ci/runner/jobs_put_spec.rb' diff --git a/.rubocop_todo/rspec/spec_file_path_suffix.yml b/.rubocop_todo/rspec/spec_file_path_suffix.yml index 1d93756a635..a7e44ae9311 100644 --- a/.rubocop_todo/rspec/spec_file_path_suffix.yml +++ b/.rubocop_todo/rspec/spec_file_path_suffix.yml @@ -1,6 +1,5 @@ --- RSpec/SpecFilePathSuffix: - Details: grace period Exclude: - 'ee/spec/frontend/fixtures/analytics/charts.rb' - 'ee/spec/frontend/fixtures/analytics/devops_reports/devops_adoption/enabled_namespaces.rb' diff --git a/.rubocop_todo/rspec/undescriptive_literals_description.yml b/.rubocop_todo/rspec/undescriptive_literals_description.yml index d0e703f3da9..238a8f7b3e2 100644 --- a/.rubocop_todo/rspec/undescriptive_literals_description.yml +++ b/.rubocop_todo/rspec/undescriptive_literals_description.yml @@ -1,5 +1,4 @@ --- RSpec/UndescriptiveLiteralsDescription: - Details: grace period Exclude: - 'spec/services/merge_requests/base_service_spec.rb' diff --git a/.rubocop_todo/rspec/verified_double_reference.yml b/.rubocop_todo/rspec/verified_double_reference.yml index 84c907e0a72..1797f5da240 100644 --- a/.rubocop_todo/rspec/verified_double_reference.yml +++ b/.rubocop_todo/rspec/verified_double_reference.yml @@ -1,7 +1,6 @@ --- # Cop supports --autocorrect. RSpec/VerifiedDoubleReference: - Details: grace period Exclude: - 'ee/spec/controllers/groups/analytics/productivity_analytics_controller_spec.rb' - 'ee/spec/controllers/groups/security/policies_controller_spec.rb' diff --git a/.rubocop_todo/style/arguments_forwarding.yml b/.rubocop_todo/style/arguments_forwarding.yml index afa320927ae..0b0890b919b 100644 --- a/.rubocop_todo/style/arguments_forwarding.yml +++ b/.rubocop_todo/style/arguments_forwarding.yml @@ -1,7 +1,6 @@ --- # Cop supports --autocorrect. Style/ArgumentsForwarding: - Details: grace period Exclude: - 'app/controllers/admin/users_controller.rb' - 'app/controllers/application_controller.rb' diff --git a/.rubocop_todo/style/empty_literal.yml b/.rubocop_todo/style/empty_literal.yml deleted file mode 100644 index 1da4e31a992..00000000000 --- a/.rubocop_todo/style/empty_literal.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -# Cop supports --autocorrect. -Style/EmptyLiteral: - Details: grace period diff --git a/.rubocop_todo/style/iso8601_date.yml b/.rubocop_todo/style/iso8601_date.yml deleted file mode 100644 index f78b684d699..00000000000 --- a/.rubocop_todo/style/iso8601_date.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -# Cop supports --autocorrect. -Style/Iso8601Date: - Details: grace period diff --git a/.rubocop_todo/style/map_into_array.yml b/.rubocop_todo/style/map_into_array.yml index 7fa10454008..5082e181e1b 100644 --- a/.rubocop_todo/style/map_into_array.yml +++ b/.rubocop_todo/style/map_into_array.yml @@ -1,7 +1,6 @@ --- # Cop supports --autocorrect. Style/MapIntoArray: - Details: grace period Exclude: - 'app/finders/projects/members/effective_access_level_finder.rb' - 'app/services/packages/nuget/extract_metadata_content_service.rb' diff --git a/.rubocop_todo/style/redundant_interpolation_unfreeze.yml b/.rubocop_todo/style/redundant_interpolation_unfreeze.yml deleted file mode 100644 index 8b6bdf95a10..00000000000 --- a/.rubocop_todo/style/redundant_interpolation_unfreeze.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -# Cop supports --autocorrect. -Style/RedundantInterpolationUnfreeze: - Details: grace period diff --git a/.rubocop_todo/style/send_with_literal_method_name.yml b/.rubocop_todo/style/send_with_literal_method_name.yml index ecf11504384..d3796b4301b 100644 --- a/.rubocop_todo/style/send_with_literal_method_name.yml +++ b/.rubocop_todo/style/send_with_literal_method_name.yml @@ -1,7 +1,6 @@ --- # Cop supports --autocorrect. Style/SendWithLiteralMethodName: - Details: grace period Exclude: - 'ee/spec/models/ci/build_spec.rb' - 'lib/gitlab/database/load_balancing/connection_proxy.rb' diff --git a/.rubocop_todo/style/super_arguments.yml b/.rubocop_todo/style/super_arguments.yml index ce47ee5f5e2..d5c18acca08 100644 --- a/.rubocop_todo/style/super_arguments.yml +++ b/.rubocop_todo/style/super_arguments.yml @@ -1,7 +1,6 @@ --- # Cop supports --autocorrect. Style/SuperArguments: - Details: grace period Exclude: - 'app/finders/merge_requests_finder.rb' - 'app/finders/packages/composer/packages_finder.rb' diff --git a/app/assets/javascripts/behaviors/find_and_replace.js b/app/assets/javascripts/behaviors/find_and_replace.js new file mode 100644 index 00000000000..c2deb01194e --- /dev/null +++ b/app/assets/javascripts/behaviors/find_and_replace.js @@ -0,0 +1,14 @@ +import $ from 'jquery'; + +if (gon.features?.findAndReplace) { + $(document).on('markdown-editor:find-and-replace', (e, keyboardEvent) => { + const $target = $(keyboardEvent.target); + + if ($target.is('textarea.markdown-area')) { + $(document).triggerHandler('markdown-editor:find-and-replace:show', [ + $target.closest('form'), + ]); + keyboardEvent.preventDefault(); + } + }); +} diff --git a/app/assets/javascripts/behaviors/index.js b/app/assets/javascripts/behaviors/index.js index d8ee4296203..3ae1ccf12ac 100644 --- a/app/assets/javascripts/behaviors/index.js +++ b/app/assets/javascripts/behaviors/index.js @@ -10,6 +10,7 @@ import { initGlobalAlerts } from './global_alerts'; import './shortcuts'; import './toggler_behavior'; import './preview_markdown'; +import './find_and_replace'; installGlEmojiElement(); initCopyAsGFM(); diff --git a/app/assets/javascripts/behaviors/shortcuts/keybindings.js b/app/assets/javascripts/behaviors/shortcuts/keybindings.js index 5c86e8b7e0b..61b7c1e199e 100644 --- a/app/assets/javascripts/behaviors/shortcuts/keybindings.js +++ b/app/assets/javascripts/behaviors/shortcuts/keybindings.js @@ -1,6 +1,6 @@ import { memoize } from 'lodash'; import AccessorUtilities from '~/lib/utils/accessor'; -import { __ } from '~/locale'; +import { __, s__ } from '~/locale'; /** * @param {object} command @@ -174,6 +174,13 @@ export const OUTDENT_LINE = { customizable: false, }; +export const FIND_AND_REPLACE = { + id: 'editing.findAndReplace', + description: s__('MarkdownEditor|Find and replace'), + defaultKeys: ['mod+f'], + customizable: false, +}; + export const TOGGLE_MARKDOWN_PREVIEW = { id: 'editing.toggleMarkdownPreview', description: __('Toggle Markdown preview'), @@ -589,6 +596,7 @@ export const EDITING_SHORTCUTS_GROUP = { STRIKETHROUGH_TEXT, LINK_TEXT, TOGGLE_MARKDOWN_PREVIEW, + FIND_AND_REPLACE, EDIT_RECENT_COMMENT, SAVE_CHANGES, ], diff --git a/app/assets/javascripts/behaviors/shortcuts/shortcuts.js b/app/assets/javascripts/behaviors/shortcuts/shortcuts.js index ede9afd799c..0f953b5de58 100644 --- a/app/assets/javascripts/behaviors/shortcuts/shortcuts.js +++ b/app/assets/javascripts/behaviors/shortcuts/shortcuts.js @@ -18,6 +18,7 @@ import { HIDE_APPEARING_CONTENT, TOGGLE_CANARY, TOGGLE_MARKDOWN_PREVIEW, + FIND_AND_REPLACE, GO_TO_YOUR_TODO_LIST, GO_TO_ACTIVITY_FEED, GO_TO_YOUR_ISSUES, @@ -113,6 +114,14 @@ export default class Shortcuts { keysFor(TOGGLE_MARKDOWN_PREVIEW).includes(combo) ? false : undefined, ); + if (gon?.features?.findAndReplace) { + this.add(FIND_AND_REPLACE, Shortcuts.toggleFindAndReplaceBar); + + addStopCallback((e, element, combo) => + keysFor(FIND_AND_REPLACE).includes(combo) ? false : undefined, + ); + } + $(document).on('click', '.js-shortcuts-modal-trigger', this.onToggleHelp); if (shouldDisableShortcuts()) { @@ -255,6 +264,10 @@ export default class Shortcuts { $(document).triggerHandler('markdown-preview:toggle', [e]); } + static toggleFindAndReplaceBar(e) { + $(document).triggerHandler('markdown-editor:find-and-replace', [e]); + } + focusFilter(e) { if (!this.filterInput) { this.filterInput = $('input[type=search]', '.nav-controls'); diff --git a/app/assets/javascripts/ci/jobs_page/components/job_cells/pipeline_cell.vue b/app/assets/javascripts/ci/jobs_page/components/job_cells/pipeline_cell.vue index 0699d1eec7f..ea4f7295527 100644 --- a/app/assets/javascripts/ci/jobs_page/components/job_cells/pipeline_cell.vue +++ b/app/assets/javascripts/ci/jobs_page/components/job_cells/pipeline_cell.vue @@ -45,7 +45,7 @@ export default { {{ pipelineId }} - + {{ __('created by') }} @@ -54,7 +54,7 @@ export default { -
+
{{ $options.i18n.stageLabel }}: {{ job.stage.name }}
diff --git a/app/assets/javascripts/ci/jobs_page/components/job_cells/status_cell.vue b/app/assets/javascripts/ci/jobs_page/components/job_cells/status_cell.vue index 978a940f9f6..092ceb93990 100644 --- a/app/assets/javascripts/ci/jobs_page/components/job_cells/status_cell.vue +++ b/app/assets/javascripts/ci/jobs_page/components/job_cells/status_cell.vue @@ -39,7 +39,7 @@ export default { @@ -846,6 +850,7 @@ export default { :can-current-user-fork="canCurrentUserFork" :view-diffs-file-by-file="viewDiffsFileByFile" :is-diff-view-active="currentDiffFileId === file.file_hash" + class="gl-mb-5" />