diff options
Diffstat (limited to '.rubocop_todo/style')
22 files changed, 171 insertions, 117 deletions
diff --git a/.rubocop_todo/style/accessor_grouping.yml b/.rubocop_todo/style/accessor_grouping.yml index 821e3398301..a2ba217dbcc 100644 --- a/.rubocop_todo/style/accessor_grouping.yml +++ b/.rubocop_todo/style/accessor_grouping.yml @@ -1,9 +1,7 @@ --- # Cop supports --auto-correct. Style/AccessorGrouping: - # Offense count: 254 - # Temporarily disabled due to too many offenses - Enabled: false + Details: grace period Exclude: - 'app/finders/template_finder.rb' - 'app/models/commit.rb' @@ -23,7 +21,6 @@ Style/AccessorGrouping: - 'app/models/project.rb' - 'app/services/deployments/update_environment_service.rb' - 'app/services/issues/clone_service.rb' - - 'app/services/merge_requests/bulk_remove_attention_requested_service.rb' - 'app/services/note_summary.rb' - 'app/services/notification_recipients/builder/default.rb' - 'app/services/task_list_toggle_service.rb' @@ -38,6 +35,7 @@ Style/AccessorGrouping: - 'ee/lib/gitlab/ci/reports/security/locations/dast.rb' - 'ee/lib/gitlab/ci/reports/security/locations/dependency_scanning.rb' - 'lib/feature/definition.rb' + - 'lib/gitlab/audit/type/definition.rb' - 'lib/gitlab/bitbucket_server_import/importer.rb' - 'lib/gitlab/ci/config/external/context.rb' - 'lib/gitlab/ci/reports/security/finding.rb' @@ -65,7 +63,6 @@ Style/AccessorGrouping: - 'lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job.rb' - 'lib/gitlab/suggestions/file_suggestion.rb' - 'lib/gitlab/tracking/event_definition.rb' - - 'lib/gitlab/tree_summary.rb' - 'lib/gitlab/usage/metric_definition.rb' - 'lib/gitlab/usage/metrics/instrumentations/base_metric.rb' - 'lib/gitlab/usage/service_ping/instrumented_payload.rb' diff --git a/.rubocop_todo/style/case_like_if.yml b/.rubocop_todo/style/case_like_if.yml index 119ca3d800f..61f2e6bc238 100644 --- a/.rubocop_todo/style/case_like_if.yml +++ b/.rubocop_todo/style/case_like_if.yml @@ -1,9 +1,7 @@ --- # Cop supports --auto-correct. Style/CaseLikeIf: - # Offense count: 60 - # Temporarily disabled due to too many offenses - Enabled: false + Details: grace period Exclude: - 'app/controllers/concerns/issuable_actions.rb' - 'app/controllers/groups/dependency_proxy/application_controller.rb' @@ -13,6 +11,7 @@ Style/CaseLikeIf: - 'app/helpers/broadcast_messages_helper.rb' - 'app/helpers/issues_helper.rb' - 'app/helpers/routing/pseudonymization_helper.rb' + - 'app/helpers/todos_helper.rb' - 'app/models/integrations/jira.rb' - 'app/models/members/member_task.rb' - 'app/models/namespace.rb' @@ -21,8 +20,11 @@ Style/CaseLikeIf: - 'app/services/google_cloud/generate_pipeline_service.rb' - 'app/services/issuable/bulk_update_service.rb' - 'app/services/todo_service.rb' + - 'app/services/user_project_access_changed_service.rb' - 'ee/app/controllers/concerns/credentials_inventory_actions.rb' - 'ee/app/finders/ee/notes_finder.rb' + - 'ee/app/finders/security/scan_execution_policies_finder.rb' + - 'ee/app/finders/security/training_providers/secure_code_warrior_url_finder.rb' - 'ee/app/helpers/ee/branches_helper.rb' - 'ee/app/services/epics/tree_reorder_service.rb' - 'ee/app/services/merge_request_approval_settings/update_service.rb' @@ -43,18 +45,18 @@ Style/CaseLikeIf: - 'lib/gitlab/utils/strong_memoize.rb' - 'qa/qa/git/repository.rb' - 'qa/qa/scenario/bootable.rb' - - 'rubocop/cop/gitlab/keys_first_and_values_first.rb' - 'spec/features/boards/user_adds_lists_to_board_spec.rb' - 'spec/lib/gitlab/auth/auth_finders_spec.rb' - 'spec/lib/gitlab/database/load_balancing_spec.rb' - 'spec/lib/omni_auth/strategies/jwt_spec.rb' - 'spec/models/concerns/sha_attribute_spec.rb' - 'spec/models/preloaders/labels_preloader_spec.rb' + - 'spec/requests/api/personal_access_tokens_spec.rb' - 'spec/requests/api/rubygem_packages_spec.rb' - 'spec/requests/api/terraform/modules/v1/packages_spec.rb' + - 'spec/services/ci/pipeline_processing/atomic_processing_service_spec.rb' - 'spec/services/resource_events/change_state_service_spec.rb' - 'spec/support/helpers/filter_spec_helper.rb' - - 'spec/support/matchers/abort_matcher.rb' - 'spec/support/shared_examples/metrics/active_record_subscriber_shared_examples.rb' - 'spec/support/shared_examples/requests/api/notes_shared_examples.rb' - 'spec/support/shared_examples/uploaders/object_storage_shared_examples.rb' diff --git a/.rubocop_todo/style/class_and_module_children.yml b/.rubocop_todo/style/class_and_module_children.yml index 2674902c7ee..bff827ba5d3 100644 --- a/.rubocop_todo/style/class_and_module_children.yml +++ b/.rubocop_todo/style/class_and_module_children.yml @@ -521,6 +521,7 @@ Style/ClassAndModuleChildren: - 'ee/db/fixtures/development/21_dast_profiles.rb' - 'ee/db/fixtures/development/30_customizable_cycle_analytics.rb' - 'ee/db/fixtures/development/32_compliance_report_violations.rb' + - 'ee/db/fixtures/development/35_merge_request_predictions.rb' - 'ee/db/fixtures/development/90_productivity_analytics.rb' - 'ee/lib/ee/gitlab/analytics/cycle_analytics/aggregated/base_query_builder.rb' - 'ee/lib/ee/gitlab/analytics/cycle_analytics/base_query_builder.rb' diff --git a/.rubocop_todo/style/conditional_assignment.yml b/.rubocop_todo/style/conditional_assignment.yml new file mode 100644 index 00000000000..c9bbaaeb175 --- /dev/null +++ b/.rubocop_todo/style/conditional_assignment.yml @@ -0,0 +1,5 @@ +--- +# Cop supports --auto-correct. +Style/ConditionalAssignment: + Exclude: + - 'app/helpers/icons_helper.rb' diff --git a/.rubocop_todo/style/each_for_simple_loop.yml b/.rubocop_todo/style/each_for_simple_loop.yml new file mode 100644 index 00000000000..5d495f890d2 --- /dev/null +++ b/.rubocop_todo/style/each_for_simple_loop.yml @@ -0,0 +1,6 @@ +--- +# Cop supports --auto-correct. +Style/EachForSimpleLoop: + Exclude: + - 'ee/spec/lib/gitlab/insights/reducers/count_per_period_reducer_spec.rb' + - 'spec/services/members/invitation_reminder_email_service_spec.rb' diff --git a/.rubocop_todo/style/empty_method.yml b/.rubocop_todo/style/empty_method.yml index 3e6a1efec70..7fbec98ead5 100644 --- a/.rubocop_todo/style/empty_method.yml +++ b/.rubocop_todo/style/empty_method.yml @@ -1,16 +1,12 @@ --- # Cop supports --auto-correct. Style/EmptyMethod: - # Offense count: 240 - # Temporarily disabled due to too many offenses - Enabled: false + Details: grace period Exclude: - 'app/controllers/admin/application_settings/appearances_controller.rb' - 'app/controllers/admin/applications_controller.rb' - 'app/controllers/admin/broadcast_messages_controller.rb' - 'app/controllers/admin/deploy_keys_controller.rb' - - 'app/controllers/admin/hook_logs_controller.rb' - - 'app/controllers/admin/hooks_controller.rb' - 'app/controllers/admin/identities_controller.rb' - 'app/controllers/admin/labels_controller.rb' - 'app/controllers/admin/runners_controller.rb' @@ -35,13 +31,11 @@ Style/EmptyMethod: - 'app/controllers/projects/alert_management_controller.rb' - 'app/controllers/projects/ci/lints_controller.rb' - 'app/controllers/projects/ci/pipeline_editor_controller.rb' - - 'app/controllers/projects/ci/secure_files_controller.rb' - 'app/controllers/projects/confluences_controller.rb' - 'app/controllers/projects/deploy_keys_controller.rb' - 'app/controllers/projects/environments_controller.rb' - 'app/controllers/projects/feature_flags_controller.rb' - 'app/controllers/projects/feature_flags_user_lists_controller.rb' - - 'app/controllers/projects/hook_logs_controller.rb' - 'app/controllers/projects/import/jira_controller.rb' - 'app/controllers/projects/imports_controller.rb' - 'app/controllers/projects/incidents_controller.rb' @@ -55,30 +49,32 @@ Style/EmptyMethod: - 'app/controllers/projects/runners_controller.rb' - 'app/controllers/projects/settings/integrations_controller.rb' - 'app/controllers/projects/settings/packages_and_registries_controller.rb' - - 'app/controllers/projects/tags/releases_controller.rb' - 'app/controllers/projects/terraform_controller.rb' - 'app/controllers/projects/triggers_controller.rb' + - 'app/controllers/pwa_controller.rb' - 'app/controllers/registrations/welcome_controller.rb' - 'app/controllers/search_controller.rb' + - 'app/experiments/security_actions_continuous_onboarding_experiment.rb' - 'app/graphql/resolvers/concerns/caching_array_resolver.rb' - 'app/helpers/subscribable_banner_helper.rb' - 'app/helpers/users/callouts_helper.rb' - 'app/models/ci/bridge.rb' + - 'app/models/ci/job_artifact.rb' - 'app/models/concerns/cross_database_modification.rb' - 'app/models/concerns/reactive_caching.rb' - 'app/models/concerns/relative_positioning.rb' - 'app/models/hooks/web_hook.rb' - 'app/models/integrations/hangouts_chat.rb' - 'app/models/integrations/microsoft_teams.rb' + - 'app/models/integrations/pumble.rb' - 'app/models/integrations/unify_circuit.rb' - 'app/models/integrations/webex_teams.rb' - 'app/models/wiki.rb' - 'app/services/auto_merge/base_service.rb' - 'app/services/award_emojis/destroy_service.rb' + - 'app/services/groups/transfer_service.rb' - 'app/services/issuable_base_service.rb' - - 'app/services/issues/reopen_service.rb' - 'app/services/projects/transfer_service.rb' - - 'app/workers/authorized_projects_worker.rb' - 'app/workers/namespaces/root_statistics_worker.rb' - 'db/migrate/20210420012444_change_web_hook_events_default.rb' - 'db/migrate/20210507191949_add_remove_on_issue_close_to_labels.rb' @@ -92,6 +88,7 @@ Style/EmptyMethod: - 'db/post_migrate/20220324032250_migrate_shimo_confluence_service_category.rb' - 'db/post_migrate/20220412143552_consume_remaining_encrypt_integration_property_jobs.rb' - 'db/post_migrate/20220425121435_backfill_integrations_enable_ssl_verification.rb' + - 'db/post_migrate/20220524074947_finalize_backfill_null_note_discussion_ids.rb' - 'ee/app/controllers/admin/emails_controller.rb' - 'ee/app/controllers/admin/geo/designs_controller.rb' - 'ee/app/controllers/admin/geo/settings_controller.rb' @@ -101,9 +98,8 @@ Style/EmptyMethod: - 'ee/app/controllers/groups/analytics/devops_adoption_controller.rb' - 'ee/app/controllers/groups/compliance_frameworks_controller.rb' - 'ee/app/controllers/groups/feature_discovery_moments_controller.rb' - - 'ee/app/controllers/groups/hooks_controller.rb' - 'ee/app/controllers/groups/ldap_group_links_controller.rb' - - 'ee/app/controllers/groups/push_rules_controller.rb' + - 'ee/app/controllers/groups/settings/reporting_controller.rb' - 'ee/app/controllers/projects/analytics/code_reviews_controller.rb' - 'ee/app/controllers/projects/analytics/merge_request_analytics_controller.rb' - 'ee/app/controllers/projects/incident_management/escalation_policies_controller.rb' @@ -122,8 +118,10 @@ Style/EmptyMethod: - 'ee/app/controllers/subscriptions/groups_controller.rb' - 'ee/app/controllers/trial_registrations_controller.rb' - 'ee/app/controllers/trials_controller.rb' + - 'ee/app/controllers/users/identity_verification_controller.rb' - 'ee/app/experiments/cart_abandonment_modal_experiment.rb' - 'ee/app/models/ee/epic.rb' + - 'ee/app/models/geo/group_wiki_repository_registry.rb' - 'ee/app/services/feature_flag_issues/destroy_service.rb' - 'ee/db/geo/migrate/20170906174622_remove_duplicates_from_project_registry.rb' - 'lib/api/helpers/packages/conan/api_helpers.rb' @@ -135,6 +133,8 @@ Style/EmptyMethod: - 'lib/gitlab/alert_management/payload/base.rb' - 'lib/gitlab/background_migration/backfill_iteration_cadence_id_for_boards.rb' - 'lib/gitlab/background_migration/create_security_setting.rb' + - 'lib/gitlab/background_migration/delete_approval_rules_with_vulnerability.rb' + - 'lib/gitlab/background_migration/delete_invalid_epic_issues.rb' - 'lib/gitlab/background_migration/drop_invalid_remediations.rb' - 'lib/gitlab/background_migration/fix_incorrect_max_seats_used.rb' - 'lib/gitlab/background_migration/migrate_approver_to_approval_rules.rb' @@ -142,6 +142,7 @@ Style/EmptyMethod: - 'lib/gitlab/background_migration/migrate_approver_to_approval_rules_in_batch.rb' - 'lib/gitlab/background_migration/migrate_job_artifact_registry_to_ssf.rb' - 'lib/gitlab/background_migration/migrate_requirements_to_work_items.rb' + - 'lib/gitlab/background_migration/migrate_shared_vulnerability_scanners.rb' - 'lib/gitlab/background_migration/recalculate_vulnerability_finding_signatures_for_findings.rb' - 'lib/gitlab/background_migration/update_vulnerability_occurrences_location.rb' - 'lib/gitlab/ci/config/entry/need.rb' @@ -150,10 +151,10 @@ Style/EmptyMethod: - 'lib/gitlab/ci/pipeline/chain/validate/after_config.rb' - 'lib/gitlab/config/entry/node.rb' - 'lib/gitlab/config/entry/simplifiable.rb' - - 'lib/gitlab/email/message/in_product_marketing/experience.rb' - 'lib/gitlab/empty_search_results.rb' - 'lib/gitlab/git_access.rb' - 'lib/gitlab/import_export/json/ndjson_writer.rb' + - 'lib/gitlab/mailgun/webhook_processors/base.rb' - 'lib/gitlab/null_request_store.rb' - 'lib/gitlab/usage_data_non_sql_metrics.rb' - 'lib/mattermost/session.rb' @@ -162,7 +163,6 @@ Style/EmptyMethod: - 'qa/qa/resource/job.rb' - 'qa/qa/resource/package.rb' - 'qa/qa/resource/registry_repository.rb' - - 'qa/qa/resource/runner.rb' - 'qa/qa/service/cluster_provider/k3d.rb' - 'qa/qa/service/cluster_provider/k3s.rb' - 'qa/qa/service/cluster_provider/minikube.rb' @@ -173,7 +173,6 @@ Style/EmptyMethod: - 'spec/lib/gitlab/database/load_balancing/sidekiq_client_middleware_spec.rb' - 'spec/lib/gitlab/database/load_balancing/sidekiq_server_middleware_spec.rb' - 'spec/lib/gitlab/database/migration_helpers/restrict_gitlab_schema_spec.rb' - - 'spec/lib/gitlab/database/migrations/background_migration_helpers_spec.rb' - 'spec/lib/gitlab/database/partitioning/sliding_list_strategy_spec.rb' - 'spec/lib/gitlab/database/postgresql_adapter/dump_schema_versions_mixin_spec.rb' - 'spec/lib/gitlab/database/postgresql_database_tasks/load_schema_versions_mixin_spec.rb' @@ -192,4 +191,5 @@ Style/EmptyMethod: - 'spec/lib/gitlab/utils/delegator_override/validator_spec.rb' - 'spec/lib/gitlab/utils/delegator_override_spec.rb' - 'spec/lib/gitlab/utils/override_spec.rb' + - 'spec/lib/gitlab/utils/strong_memoize_spec.rb' - 'spec/workers/concerns/waitable_worker_spec.rb' diff --git a/.rubocop_todo/style/explicit_block_argument.yml b/.rubocop_todo/style/explicit_block_argument.yml index 63b7b5d387d..346be201322 100644 --- a/.rubocop_todo/style/explicit_block_argument.yml +++ b/.rubocop_todo/style/explicit_block_argument.yml @@ -1,11 +1,10 @@ --- # Cop supports --auto-correct. Style/ExplicitBlockArgument: - # Offense count: 143 - # Temporarily disabled due to too many offenses - Enabled: false + Details: grace period Exclude: - 'app/controllers/admin/background_migrations_controller.rb' + - 'app/controllers/admin/batched_jobs_controller.rb' - 'app/controllers/application_controller.rb' - 'app/models/application_record.rb' - 'app/models/broadcast_message.rb' @@ -14,13 +13,14 @@ Style/ExplicitBlockArgument: - 'app/models/ci/build_trace_chunks/redis_trace_chunks.rb' - 'app/models/concerns/counter_attribute.rb' - 'app/models/merge_request.rb' + - 'app/models/merge_request_diff.rb' - 'app/models/snippet_repository.rb' - 'app/services/import_export_clean_up_service.rb' - 'app/services/packages/debian/generate_distribution_key_service.rb' - 'app/workers/concerns/each_shard_worker.rb' - - 'db/migrate/20210629031900_associate_existing_dast_builds_with_variables.rb' - 'ee/app/services/gitlab_subscriptions/fetch_subscription_plans_service.rb' - 'ee/app/services/group_saml/identity/destroy_service.rb' + - 'ee/app/services/security/security_orchestration_policies/base_merge_requests_service.rb' - 'ee/lib/ee/backup/repositories.rb' - 'ee/lib/ee/gitlab/background_migration/migrate_approver_to_approval_rules.rb' - 'ee/lib/gitlab/audit/events/preloader.rb' @@ -44,6 +44,7 @@ Style/ExplicitBlockArgument: - 'lib/gitlab/ci/variables/collection.rb' - 'lib/gitlab/cleanup/remote_uploads.rb' - 'lib/gitlab/database/dynamic_model_helpers.rb' + - 'lib/gitlab/database/lock_writes_manager.rb' - 'lib/gitlab/database/reindexing/reindex_concurrently.rb' - 'lib/gitlab/git/changes.rb' - 'lib/gitlab/gitaly_client/list_blobs_adapter.rb' @@ -58,16 +59,20 @@ Style/ExplicitBlockArgument: - 'lib/gitlab/import_export/project/base_task.rb' - 'lib/gitlab/import_export/project/export_task.rb' - 'lib/gitlab/import_export/project/import_task.rb' + - 'lib/gitlab/import_export/remote_stream_upload.rb' + - 'lib/gitlab/issuable/clone/copy_resource_events_service.rb' - 'lib/gitlab/metrics/dashboard/cache.rb' - 'lib/gitlab/metrics/dashboard/stages/base_stage.rb' - 'lib/gitlab/profiler.rb' - 'lib/gitlab/redis/wrapper.rb' - 'lib/gitlab/reference_counter.rb' - 'lib/gitlab/seeder.rb' + - 'lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job.rb' - 'lib/gitlab/sidekiq_middleware/monitor.rb' - 'lib/gitlab/sidekiq_middleware/query_analyzer.rb' - 'lib/gitlab/sidekiq_middleware/request_store_middleware.rb' - 'lib/gitlab/sidekiq_middleware/server_metrics.rb' + - 'lib/gitlab/sidekiq_status.rb' - 'lib/gitlab/utils/measuring.rb' - 'lib/tasks/config_lint.rake' - 'qa/qa/ee/page/insights/show.rb' @@ -87,7 +92,6 @@ Style/ExplicitBlockArgument: - 'qa/qa/resource/events/base.rb' - 'qa/qa/runtime/api/repository_storage_moves.rb' - 'qa/qa/runtime/search.rb' - - 'qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_file_size_spec.rb' - 'rubocop/code_reuse_helpers.rb' - 'spec/features/merge_request/user_sees_wip_help_message_spec.rb' - 'spec/features/projects/features_visibility_spec.rb' @@ -99,9 +103,10 @@ Style/ExplicitBlockArgument: - 'spec/models/repository_spec.rb' - 'spec/services/pages/zip_directory_service_spec.rb' - 'spec/services/todo_service_spec.rb' + - 'spec/support/database/gitlab_schemas_validate_connection.rb' - 'spec/support/helpers/feature_flag_helpers.rb' + - 'spec/support/helpers/features/runners_helpers.rb' - 'spec/support/helpers/features/top_nav_spec_helpers.rb' - - 'spec/support/helpers/graphql_helpers.rb' - 'spec/support/helpers/modal_helpers.rb' - 'spec/support/helpers/next_found_instance_of.rb' - 'spec/support/helpers/usage_data_helpers.rb' diff --git a/.rubocop_todo/style/format_string.yml b/.rubocop_todo/style/format_string.yml index 66c368a7a52..4da3c32416c 100644 --- a/.rubocop_todo/style/format_string.yml +++ b/.rubocop_todo/style/format_string.yml @@ -142,6 +142,7 @@ Style/FormatString: - 'app/presenters/ci/pipeline_presenter.rb' - 'app/presenters/merge_request_presenter.rb' - 'app/presenters/project_presenter.rb' + - 'app/presenters/key_presenter.rb' - 'app/serializers/build_details_entity.rb' - 'app/services/alert_management/alerts/update_service.rb' - 'app/services/boards/lists/base_create_service.rb' @@ -265,7 +266,6 @@ Style/FormatString: - 'ee/app/services/vulnerabilities/destroy_dismissal_feedback_service.rb' - 'ee/app/services/vulnerabilities/dismiss_service.rb' - 'ee/app/services/vulnerabilities/finding_dismiss_service.rb' - - 'ee/app/services/vulnerabilities/findings/create_from_security_finding_service.rb' - 'ee/app/services/vulnerabilities/historical_statistics/adjustment_service.rb' - 'ee/app/services/vulnerabilities/statistics/adjustment_service.rb' - 'ee/app/services/vulnerability_external_issue_links/create_service.rb' diff --git a/.rubocop_todo/style/guard_clause.yml b/.rubocop_todo/style/guard_clause.yml index b07c29ca1df..a4ae491b902 100644 --- a/.rubocop_todo/style/guard_clause.yml +++ b/.rubocop_todo/style/guard_clause.yml @@ -378,6 +378,7 @@ Style/GuardClause: - 'ee/app/models/namespace_limit.rb' - 'ee/app/models/preloaders/environments/protected_environment_preloader.rb' - 'ee/app/models/protected_environment.rb' + - 'ee/app/models/protected_environments/deploy_access_level.rb' - 'ee/app/models/sbom/occurrence.rb' - 'ee/app/models/users_security_dashboard_project.rb' - 'ee/app/models/vulnerabilities/feedback.rb' diff --git a/.rubocop_todo/style/if_unless_modifier.yml b/.rubocop_todo/style/if_unless_modifier.yml index cc21860d462..8e295c68623 100644 --- a/.rubocop_todo/style/if_unless_modifier.yml +++ b/.rubocop_todo/style/if_unless_modifier.yml @@ -34,7 +34,6 @@ Style/IfUnlessModifier: - 'app/controllers/import/github_controller.rb' - 'app/controllers/import/gitlab_controller.rb' - 'app/controllers/import/manifest_controller.rb' - - 'app/controllers/jwt_controller.rb' - 'app/controllers/omniauth_callbacks_controller.rb' - 'app/controllers/profiles/emails_controller.rb' - 'app/controllers/profiles/two_factor_auths_controller.rb' @@ -47,7 +46,6 @@ Style/IfUnlessModifier: - 'app/controllers/projects/deploy_keys_controller.rb' - 'app/controllers/projects/design_management/designs_controller.rb' - 'app/controllers/projects/imports_controller.rb' - - 'app/controllers/projects/integrations/shimos_controller.rb' - 'app/controllers/projects/issues_controller.rb' - 'app/controllers/projects/merge_requests/diffs_controller.rb' - 'app/controllers/projects/merge_requests_controller.rb' @@ -94,13 +92,9 @@ Style/IfUnlessModifier: - 'app/graphql/mutations/release_asset_links/update.rb' - 'app/graphql/mutations/todos/mark_all_done.rb' - 'app/graphql/resolvers/blobs_resolver.rb' - - 'app/graphql/resolvers/ci/runner_jobs_resolver.rb' - 'app/graphql/resolvers/concerns/board_item_filterable.rb' - 'app/graphql/resolvers/concerns/issue_resolver_arguments.rb' - 'app/graphql/resolvers/concerns/time_frame_arguments.rb' - - 'app/graphql/resolvers/group_packages_resolver.rb' - - 'app/graphql/resolvers/package_details_resolver.rb' - - 'app/graphql/resolvers/project_jobs_resolver.rb' - 'app/graphql/resolvers/project_pipeline_resolver.rb' - 'app/graphql/resolvers/timelog_resolver.rb' - 'app/graphql/types/ci/job_type.rb' @@ -133,7 +127,6 @@ Style/IfUnlessModifier: - 'app/helpers/selects_helper.rb' - 'app/helpers/snippets_helper.rb' - 'app/helpers/sorting_helper.rb' - - 'app/helpers/storage_helper.rb' - 'app/helpers/submodule_helper.rb' - 'app/helpers/tab_helper.rb' - 'app/helpers/timeboxes_helper.rb' @@ -168,7 +161,6 @@ Style/IfUnlessModifier: - 'app/models/concerns/bulk_users_by_email_load.rb' - 'app/models/concerns/cache_markdown_field.rb' - 'app/models/concerns/ci/artifactable.rb' - - 'app/models/concerns/counter_attribute.rb' - 'app/models/concerns/deprecated_assignee.rb' - 'app/models/concerns/group_descendant.rb' - 'app/models/concerns/has_wiki_page_meta_attributes.rb' @@ -272,7 +264,6 @@ Style/IfUnlessModifier: - 'app/services/ci/job_token_scope/remove_project_service.rb' - 'app/services/ci/parse_dotenv_artifact_service.rb' - 'app/services/ci/pipeline_processing/atomic_processing_service.rb' - - 'app/services/ci/pipelines/add_job_service.rb' - 'app/services/ci/register_job_service.rb' - 'app/services/ci/retry_job_service.rb' - 'app/services/ci/run_scheduled_build_service.rb' @@ -322,14 +313,11 @@ Style/IfUnlessModifier: - 'app/services/merge_requests/add_context_service.rb' - 'app/services/merge_requests/base_service.rb' - 'app/services/merge_requests/build_service.rb' - - 'app/services/merge_requests/handle_assignees_change_service.rb' - 'app/services/merge_requests/merge_base_service.rb' - 'app/services/merge_requests/mergeability_check_service.rb' - 'app/services/merge_requests/push_options_handler_service.rb' - 'app/services/merge_requests/refresh_service.rb' - - 'app/services/merge_requests/request_attention_service.rb' - 'app/services/merge_requests/squash_service.rb' - - 'app/services/merge_requests/toggle_attention_requested_service.rb' - 'app/services/merge_requests/update_service.rb' - 'app/services/metrics/dashboard/clone_dashboard_service.rb' - 'app/services/metrics/dashboard/update_dashboard_service.rb' @@ -354,7 +342,6 @@ Style/IfUnlessModifier: - 'app/services/packages/maven/find_or_create_package_service.rb' - 'app/services/packages/nuget/update_package_from_metadata_service.rb' - 'app/services/packages/pypi/create_package_service.rb' - - 'app/services/packages/rubygems/dependency_resolver_service.rb' - 'app/services/pages/migrate_legacy_storage_to_deployment_service.rb' - 'app/services/post_receive_service.rb' - 'app/services/projects/container_repository/gitlab/delete_tags_service.rb' @@ -375,7 +362,6 @@ Style/IfUnlessModifier: - 'app/services/projects/update_repository_storage_service.rb' - 'app/services/protected_branches/cache_service.rb' - 'app/services/resource_access_tokens/create_service.rb' - - 'app/services/resource_events/change_labels_service.rb' - 'app/services/snippets/create_service.rb' - 'app/services/snippets/destroy_service.rb' - 'app/services/snippets/repository_validation_service.rb' @@ -422,8 +408,6 @@ Style/IfUnlessModifier: - 'app/workers/google_cloud/create_cloudsql_instance_worker.rb' - 'app/workers/issues/rebalancing_worker.rb' - 'app/workers/merge_request_mergeability_check_worker.rb' - - 'app/workers/object_storage/migrate_uploads_worker.rb' - - 'app/workers/process_commit_worker.rb' - 'app/workers/projects/import_export/relation_export_worker.rb' - 'app/workers/remove_expired_members_worker.rb' - 'app/workers/repository_fork_worker.rb' @@ -450,8 +434,6 @@ Style/IfUnlessModifier: - 'config/initializers/sidekiq.rb' - 'config/initializers/stackprof.rb' - 'config/initializers/validate_database_config.rb' - - 'config/initializers/wikicloth_redos_patch.rb' - - 'config/initializers/zz_metrics.rb' - 'config/initializers_before_autoloader/002_sidekiq.rb' - 'config/routes.rb' - 'danger/database/Dangerfile' @@ -603,6 +585,7 @@ Style/IfUnlessModifier: - 'ee/app/services/ee/protected_branches/create_service.rb' - 'ee/app/services/ee/todo_service.rb' - 'ee/app/services/ee/users/update_service.rb' + - 'ee/app/services/elastic/cluster_reindexing_service.rb' - 'ee/app/services/elastic/indexing_control_service.rb' - 'ee/app/services/elastic/process_bookkeeping_service.rb' - 'ee/app/services/epics/base_service.rb' @@ -652,7 +635,6 @@ Style/IfUnlessModifier: - 'ee/app/services/vulnerability_feedback/create_service.rb' - 'ee/app/services/vulnerability_feedback/destroy_service.rb' - 'ee/app/services/vulnerability_feedback_module/update_service.rb' - - 'ee/app/services/elastic/cluster_reindexing_service.rb' - 'ee/app/validators/host_validator.rb' - 'ee/app/validators/password/complexity_validator.rb' - 'ee/app/workers/app_sec/dast/profile_schedule_worker.rb' @@ -889,7 +871,6 @@ Style/IfUnlessModifier: - 'lib/gitlab/ci/config/normalizer.rb' - 'lib/gitlab/ci/parsers/coverage/sax_document.rb' - 'lib/gitlab/ci/parsers/security/common.rb' - - 'lib/gitlab/ci/parsers/security/validators/schema_validator.rb' - 'lib/gitlab/ci/pipeline/chain/populate.rb' - 'lib/gitlab/ci/pipeline/chain/seed.rb' - 'lib/gitlab/ci/pipeline/chain/validate/abilities.rb' @@ -991,7 +972,6 @@ Style/IfUnlessModifier: - 'lib/gitlab/import_export/project/relation_factory.rb' - 'lib/gitlab/import_export/project/tree_restorer.rb' - 'lib/gitlab/instrumentation/rate_limiting_gates.rb' - - 'lib/gitlab/instrumentation/redis_interceptor.rb' - 'lib/gitlab/jira_import.rb' - 'lib/gitlab/jira_import/base_importer.rb' - 'lib/gitlab/legacy_github_import/client.rb' @@ -1034,7 +1014,6 @@ Style/IfUnlessModifier: - 'lib/gitlab/search/params.rb' - 'lib/gitlab/search_context.rb' - 'lib/gitlab/search_results.rb' - - 'lib/gitlab/shell.rb' - 'lib/gitlab/sidekiq_config.rb' - 'lib/gitlab/sidekiq_config/cli_methods.rb' - 'lib/gitlab/sidekiq_config/worker_router.rb' @@ -1063,7 +1042,6 @@ Style/IfUnlessModifier: - 'lib/sidebars/projects/menus/packages_registries_menu.rb' - 'lib/sidebars/projects/menus/security_compliance_menu.rb' - 'lib/sidebars/projects/menus/settings_menu.rb' - - 'lib/sidebars/projects/panel.rb' - 'lib/system_check/app/systemd_unit_files_or_init_script_up_to_date_check.rb' - 'lib/system_check/init_helpers.rb' - 'lib/tasks/cleanup.rake' @@ -1078,7 +1056,6 @@ Style/IfUnlessModifier: - 'lib/tasks/gitlab/snippets.rake' - 'lib/tasks/gitlab/storage.rake' - 'lib/tasks/gitlab/update_templates.rake' - - 'qa/qa/ee/page/merge_request/show.rb' - 'qa/qa/ee/resource/settings/elasticsearch.rb' - 'qa/qa/flow/sign_up.rb' - 'qa/qa/page/component/select2.rb' @@ -1099,21 +1076,10 @@ Style/IfUnlessModifier: - 'qa/qa/runtime/ip_address.rb' - 'qa/qa/scenario/bootable.rb' - 'qa/qa/service/praefect_manager.rb' - - 'qa/qa/specs/features/api/3_create/gitaly/distributed_reads_spec.rb' - 'qa/qa/specs/features/browser_ui/3_create/merge_request/merge_when_pipeline_succeeds_spec.rb' - 'qa/qa/specs/features/browser_ui/3_create/web_ide/web_terminal_spec.rb' - 'qa/qa/specs/features/browser_ui/5_package/package_registry/nuget/nuget_group_level_spec.rb' - - 'qa/qa/specs/features/ee/api/9_enablement/elasticsearch/advanced_global_advanced_syntax_search_spec.rb' - - 'qa/qa/specs/features/ee/api/9_enablement/elasticsearch/elasticsearch_api_spec.rb' - - 'qa/qa/specs/features/ee/api/9_enablement/elasticsearch/index_tests/commit_index/commit_index_spec.rb' - - 'qa/qa/specs/features/ee/api/9_enablement/elasticsearch/index_tests/issues_index/issue_index_spec.rb' - - 'qa/qa/specs/features/ee/api/9_enablement/elasticsearch/index_tests/main_index/blob_index_spec.rb' - - 'qa/qa/specs/features/ee/api/9_enablement/elasticsearch/index_tests/merge_request_index/merge_request_index_spec.rb' - - 'qa/qa/specs/features/ee/api/9_enablement/elasticsearch/index_tests/notes_index/note_index_spec.rb' - - 'qa/qa/specs/features/ee/api/9_enablement/elasticsearch/nightly_elasticsearch_test_spec.rb' - - 'qa/qa/specs/features/ee/browser_ui/12_geo/geo_replication_maven_package_spec.rb' - 'qa/qa/specs/features/ee/browser_ui/1_manage/group/group_ldap_sync_spec.rb' - - 'qa/qa/specs/features/ee/browser_ui/9_enablement/elasticsearch/elasticsearch_reindexing_spec.rb' - 'qa/qa/specs/helpers/context_selector.rb' - 'qa/qa/specs/parallel_runner.rb' - 'qa/qa/support/loglinking.rb' @@ -1123,7 +1089,6 @@ Style/IfUnlessModifier: - 'rubocop/cop/api/grape_array_missing_coerce.rb' - 'rubocop/cop/avoid_keyword_arguments_in_sidekiq_workers.rb' - 'rubocop/cop/gitlab/event_store_subscriber.rb' - - 'rubocop/cop/gitlab/keys_first_and_values_first.rb' - 'rubocop/cop/gitlab/mark_used_feature_flags.rb' - 'rubocop/cop/gitlab/policy_rule_boolean.rb' - 'rubocop/cop/ignored_columns.rb' @@ -1131,8 +1096,6 @@ Style/IfUnlessModifier: - 'rubocop/cop/migration/add_reference.rb' - 'rubocop/cop/migration/remove_column.rb' - 'rubocop/cop/migration/sidekiq_queue_migrate.rb' - - 'rubocop/cop/performance/ar_exists_and_present_blank.rb' - - 'rubocop/cop/rspec/web_mock_enable.rb' - 'rubocop/routes_under_scope.rb' - 'scripts/pipeline_test_report_builder.rb' - 'scripts/review_apps/automated_cleanup.rb' @@ -1187,6 +1150,7 @@ Style/IfUnlessModifier: - 'spec/requests/api/integrations_spec.rb' - 'spec/requests/users_controller_spec.rb' - 'spec/routing/import_routing_spec.rb' + - 'spec/rubocop_spec_helper.rb' - 'spec/serializers/issue_sidebar_basic_entity_spec.rb' - 'spec/services/application_settings/update_service_spec.rb' - 'spec/services/clusters/applications/create_service_spec.rb' @@ -1197,7 +1161,6 @@ Style/IfUnlessModifier: - 'spec/services/packages/maven/find_or_create_package_service_spec.rb' - 'spec/services/packages/maven/metadata/append_package_file_service_spec.rb' - 'spec/services/packages/maven/metadata/sync_service_spec.rb' - - 'spec/services/projects/container_repository/cleanup_tags_service_spec.rb' - 'spec/services/projects/create_service_spec.rb' - 'spec/spec_helper.rb' - 'spec/support/capybara.rb' @@ -1213,7 +1176,6 @@ Style/IfUnlessModifier: - 'spec/support/helpers/lets_encrypt_helpers.rb' - 'spec/support/helpers/live_debugger.rb' - 'spec/support/helpers/modal_helpers.rb' - - 'spec/support/helpers/seed_helper.rb' - 'spec/support/helpers/stub_gitlab_calls.rb' - 'spec/support/helpers/stubbed_feature.rb' - 'spec/support/helpers/test_env.rb' diff --git a/.rubocop_todo/style/keyword_parameters_order.yml b/.rubocop_todo/style/keyword_parameters_order.yml index 0bb499cebb0..3521f295cc1 100644 --- a/.rubocop_todo/style/keyword_parameters_order.yml +++ b/.rubocop_todo/style/keyword_parameters_order.yml @@ -1,10 +1,9 @@ --- # Cop supports --auto-correct. Style/KeywordParametersOrder: - # Offense count: 110 - # Temporarily disabled due to too many offenses - Enabled: false + Details: grace period Exclude: + - 'app/controllers/concerns/product_analytics_tracking.rb' - 'app/finders/group_descendants_finder.rb' - 'app/finders/merge_request_target_project_finder.rb' - 'app/graphql/resolvers/package_pipelines_resolver.rb' @@ -30,20 +29,23 @@ Style/KeywordParametersOrder: - 'ee/app/services/analytics/devops_adoption/enabled_namespaces/create_service.rb' - 'ee/app/services/analytics/devops_adoption/enabled_namespaces/find_or_create_service.rb' - 'ee/app/services/audit_events/user_impersonation_group_audit_event_service.rb' - - 'ee/app/services/members/activate_service.rb' - 'ee/lib/gitlab/elastic/helper.rb' + - 'ee/lib/gitlab/insights/executors/dora_executor.rb' + - 'ee/lib/gitlab/insights/executors/issuable_executor.rb' - 'ee/spec/lib/ee/gitlab/background_migration/drop_invalid_remediations_spec.rb' - 'ee/spec/requests/api/deployments_spec.rb' + - 'lib/gitlab/background_migration/batched_migration_job.rb' - 'lib/gitlab/checks/timed_logger.rb' - 'lib/gitlab/ci/reports/security/finding.rb' + - 'lib/gitlab/cleanup/personal_access_tokens.rb' - 'lib/gitlab/database/partitioning/monthly_strategy.rb' - 'lib/gitlab/database/with_lock_retries.rb' - 'lib/gitlab/diff/diff_refs.rb' - 'lib/gitlab/email/smime/signer.rb' - - 'lib/gitlab/error_tracking.rb' - 'lib/gitlab/exclusive_lease.rb' - 'lib/gitlab/import_export/import_failure_service.rb' - 'lib/gitlab/merge_requests/mergeability/results_store.rb' + - 'lib/gitlab/usage_data_counters/editor_unique_counter.rb' - 'lib/microsoft_teams/notifier.rb' - 'qa/qa/specs/features/ee/browser_ui/3_create/repository/file_locking_spec.rb' - 'qa/qa/specs/features/ee/browser_ui/3_create/repository/push_rules_spec.rb' @@ -64,9 +66,12 @@ Style/KeywordParametersOrder: - 'spec/migrations/20220107064845_populate_vulnerability_reads_spec.rb' - 'spec/migrations/confirm_support_bot_user_spec.rb' - 'spec/services/service_ping/submit_service_ping_service_spec.rb' + - 'spec/support/helpers/doc_url_helper.rb' - 'spec/support/helpers/smime_helper.rb' - 'spec/support/helpers/workhorse_helpers.rb' + - 'spec/support/shared_examples/projects/container_repository/cleanup_tags_service_shared_examples.rb' - 'spec/support/shared_examples/services/container_expiration_policy_shared_examples.rb' - 'spec/support/shared_examples/services/dependency_proxy_ttl_policies_shared_examples.rb' - 'spec/support/shared_examples/services/namespace_package_settings_shared_examples.rb' + - 'spec/tasks/gitlab/usage_data_rake_spec.rb' - 'spec/workers/container_expiration_policies/cleanup_container_repository_worker_spec.rb' diff --git a/.rubocop_todo/style/numeric_literal_prefix.yml b/.rubocop_todo/style/numeric_literal_prefix.yml index ea0b028d11c..5de15180438 100644 --- a/.rubocop_todo/style/numeric_literal_prefix.yml +++ b/.rubocop_todo/style/numeric_literal_prefix.yml @@ -1,21 +1,22 @@ --- # Cop supports --auto-correct. Style/NumericLiteralPrefix: - # Offense count: 148 - # Temporarily disabled due to too many offenses - Enabled: false + Details: grace period Exclude: - 'app/models/container_repository.rb' - 'app/services/packages/debian/generate_distribution_key_service.rb' - 'config/initializers/01_secret_token.rb' - 'config/initializers/1_settings.rb' - 'db/post_migrate/20220131000001_schedule_trace_expiry_removal.rb' + - 'ee/lib/ee/gitlab/background_migration/backfill_project_statistics_container_repository_size.rb' - 'ee/lib/gitlab/geo/replication/blob_downloader.rb' - 'ee/spec/lib/bulk_imports/groups/pipelines/iterations_pipeline_spec.rb' + - 'ee/spec/lib/ee/gitlab/background_migration/backfill_project_statistics_container_repository_size_spec.rb' - 'ee/spec/lib/gitlab/background_migration/remove_all_trace_expiration_dates_spec.rb' - 'ee/spec/lib/gitlab/geo/replication/blob_downloader_spec.rb' - 'ee/spec/migrations/schedule_trace_expiry_removal_spec.rb' - 'ee/spec/models/analytics/devops_adoption/snapshot_spec.rb' + - 'ee/spec/models/ci/minutes/usage_spec.rb' - 'ee/spec/models/ee/group_spec.rb' - 'ee/spec/models/gitlab/seat_link_data_spec.rb' - 'ee/spec/services/incident_management/oncall_schedules/update_service_spec.rb' @@ -27,18 +28,17 @@ Style/NumericLiteralPrefix: - 'lib/gitlab/jwt_authenticatable.rb' - 'lib/system_check/app/uploads_path_permission_check.rb' - 'lib/system_check/app/uploads_path_tmp_permission_check.rb' + - 'lib/tasks/gitlab/backup.rake' - 'lib/tasks/tanuki_emoji.rake' - 'metrics_server/metrics_server.rb' - 'qa/qa/support/ssh.rb' - 'qa/spec/support/ssh_spec.rb' - 'scripts/security-harness' + - 'spec/finders/personal_access_tokens_finder_spec.rb' - 'spec/lib/gitlab/background_migration/remove_all_trace_expiration_dates_spec.rb' - 'spec/lib/gitlab/database/background_migration/batched_job_spec.rb' - 'spec/lib/gitlab/database/partitioning_migration_helpers/table_management_helpers_spec.rb' - - 'spec/lib/gitlab/encoding_helper_spec.rb' - 'spec/lib/gitlab/git/diff_spec.rb' - - 'spec/lib/gitlab/git/repository_spec.rb' - - 'spec/lib/gitlab/git/tree_spec.rb' - 'spec/lib/gitlab/gitaly_client/blobs_stitcher_spec.rb' - 'spec/lib/gitlab/gitaly_client/conflict_files_stitcher_spec.rb' - 'spec/lib/gitlab/gitaly_client/diff_spec.rb' @@ -65,11 +65,11 @@ Style/NumericLiteralPrefix: - 'spec/lib/gitlab/puma_logging/json_formatter_spec.rb' - 'spec/lib/gitlab/relative_positioning/range_spec.rb' - 'spec/metrics_server/metrics_server_spec.rb' + - 'spec/migrations/20220506154054_create_sync_namespace_details_trigger_spec.rb' + - 'spec/migrations/20220524184149_create_sync_project_namespace_details_trigger_spec.rb' - 'spec/models/issue_spec.rb' - - 'spec/models/repository_spec.rb' - - 'spec/support/helpers/repo_helpers.rb' - - 'spec/support/helpers/test_env.rb' + - 'spec/models/personal_access_token_spec.rb' + - 'spec/requests/api/personal_access_tokens_spec.rb' - 'spec/support/import_export/export_file_helper.rb' - 'spec/support/shared_examples/requests/api/nuget_packages_shared_examples.rb' - 'spec/support/shared_examples/services/packages/debian/generate_distribution_shared_examples.rb' - - 'spec/tasks/gitlab/backup_rake_spec.rb' diff --git a/.rubocop_todo/style/percent_literal_delimiters.yml b/.rubocop_todo/style/percent_literal_delimiters.yml index 9989ae3f8b3..472a722ed22 100644 --- a/.rubocop_todo/style/percent_literal_delimiters.yml +++ b/.rubocop_todo/style/percent_literal_delimiters.yml @@ -592,7 +592,6 @@ Style/PercentLiteralDelimiters: - 'lib/gitlab/search/abuse_detection.rb' - 'lib/gitlab/search_context.rb' - 'lib/gitlab/sidekiq_daemon/memory_killer.rb' - - 'lib/gitlab/sidekiq_middleware/memory_killer.rb' - 'lib/gitlab/slash_commands/presenters/base.rb' - 'lib/gitlab/ssh_public_key.rb' - 'lib/gitlab/task_helpers.rb' @@ -1155,7 +1154,6 @@ Style/PercentLiteralDelimiters: - 'spec/support/helpers/login_helpers.rb' - 'spec/support/helpers/prometheus_helpers.rb' - 'spec/support/helpers/repo_helpers.rb' - - 'spec/support/helpers/seed_helper.rb' - 'spec/support/helpers/seed_repo.rb' - 'spec/support/helpers/test_env.rb' - 'spec/support/helpers/usage_data_helpers.rb' @@ -1192,7 +1190,6 @@ Style/PercentLiteralDelimiters: - 'spec/support_specs/graphql/arguments_spec.rb' - 'spec/support_specs/helpers/active_record/query_recorder_spec.rb' - 'spec/support_specs/matchers/exceed_query_limit_helpers_spec.rb' - - 'spec/tasks/gitlab/backup_rake_spec.rb' - 'spec/tasks/gitlab/db_rake_spec.rb' - 'spec/tasks/gitlab/task_helpers_spec.rb' - 'spec/tasks/gitlab/uploads/migrate_rake_spec.rb' diff --git a/.rubocop_todo/style/redundant_begin.yml b/.rubocop_todo/style/redundant_begin.yml new file mode 100644 index 00000000000..e96cdb26b08 --- /dev/null +++ b/.rubocop_todo/style/redundant_begin.yml @@ -0,0 +1,57 @@ +--- +# Cop supports --auto-correct. +Style/RedundantBegin: + Details: grace period + Exclude: + - 'app/controllers/concerns/membership_actions.rb' + - 'app/controllers/concerns/metrics_dashboard.rb' + - 'app/controllers/concerns/renders_ldap_servers.rb' + - 'app/helpers/auth_helper.rb' + - 'app/models/event.rb' + - 'app/models/integrations/asana.rb' + - 'app/models/integrations/jira.rb' + - 'app/models/user.rb' + - 'app/services/ci/register_job_service.rb' + - 'app/services/design_management/generate_image_versions_service.rb' + - 'app/services/error_tracking/list_projects_service.rb' + - 'app/services/issue_links/create_service.rb' + - 'app/services/merge_requests/assign_issues_service.rb' + - 'app/services/projects/batch_forks_count_service.rb' + - 'app/services/projects/batch_open_issues_count_service.rb' + - 'app/services/projects/lfs_pointers/lfs_object_download_list_service.rb' + - 'app/services/users/update_highest_member_role_service.rb' + - 'ee/app/controllers/groups/sso_controller.rb' + - 'ee/app/finders/security/findings_finder.rb' + - 'ee/app/services/epics/epic_links/create_service.rb' + - 'ee/app/services/epics/related_epic_links/create_service.rb' + - 'ee/app/services/geo/container_repository_sync_service.rb' + - 'ee/app/validators/ee/json_schema_validator.rb' + - 'ee/lib/ee/api/helpers/award_emoji.rb' + - 'ee/lib/gem_extensions/elasticsearch/model/adapter/multiple/records.rb' + - 'ee/lib/gitlab/ci/parsers/security/dast.rb' + - 'ee/lib/omni_auth/strategies/group_saml.rb' + - 'ee/lib/system_check/geo/authorized_keys_check.rb' + - 'lib/api/helpers/award_emoji.rb' + - 'lib/api/time_tracking_endpoints.rb' + - 'lib/atlassian/jira_connect/serializers/build_entity.rb' + - 'lib/backup/manager.rb' + - 'lib/banzai/pipeline/wiki_pipeline.rb' + - 'lib/gem_extensions/active_record/association.rb' + - 'lib/gitlab.rb' + - 'lib/gitlab/changes_list.rb' + - 'lib/gitlab/color.rb' + - 'lib/gitlab/database/migration_helpers.rb' + - 'lib/gitlab/database/schema_cache_with_renamed_table.rb' + - 'lib/gitlab/favicon.rb' + - 'lib/gitlab/import_export/base/relation_factory.rb' + - 'lib/gitlab/import_export/members_mapper.rb' + - 'lib/gitlab/import_export/project/tree_saver.rb' + - 'lib/gitlab/instrumentation/redis_interceptor.rb' + - 'lib/gitlab/metrics/dashboard/importers/prometheus_metrics.rb' + - 'lib/gitlab/phabricator_import/project_creator.rb' + - 'lib/gitlab/project_search_results.rb' + - 'lib/gitlab/shell.rb' + - 'lib/gitlab/usage/metrics/aggregates/sources/calculations/intersection.rb' + - 'lib/sidebars/menu.rb' + - 'qa/qa/resource/api_fabricator.rb' + - 'qa/qa/runtime/api/client.rb' diff --git a/.rubocop_todo/style/redundant_condition.yml b/.rubocop_todo/style/redundant_condition.yml new file mode 100644 index 00000000000..86be40f7ffa --- /dev/null +++ b/.rubocop_todo/style/redundant_condition.yml @@ -0,0 +1,6 @@ +--- +# Cop supports --auto-correct. +Style/RedundantCondition: + Exclude: + - 'ee/app/models/license.rb' + - 'spec/lib/gitlab/sidekiq_middleware/server_metrics_spec.rb' diff --git a/.rubocop_todo/style/redundant_parentheses.yml b/.rubocop_todo/style/redundant_parentheses.yml new file mode 100644 index 00000000000..1ca658776b8 --- /dev/null +++ b/.rubocop_todo/style/redundant_parentheses.yml @@ -0,0 +1,6 @@ +--- +# Cop supports --auto-correct. +Style/RedundantParentheses: + Exclude: + - 'lib/gitlab/database/tables_truncate.rb' + - 'qa/qa/specs/features/ee/browser_ui/11_fulfillment/utilization/billing_seats_usage_data_spec.rb' diff --git a/.rubocop_todo/style/single_argument_dig.yml b/.rubocop_todo/style/single_argument_dig.yml index 860183426e9..3ffd27d26ae 100644 --- a/.rubocop_todo/style/single_argument_dig.yml +++ b/.rubocop_todo/style/single_argument_dig.yml @@ -1,9 +1,7 @@ --- # Cop supports --auto-correct. Style/SingleArgumentDig: - # Offense count: 150 - # Temporarily disabled due to too many offenses - Enabled: false + Details: grace period Exclude: - 'app/graphql/resolvers/namespace_projects_resolver.rb' - 'app/models/ci/build.rb' @@ -22,6 +20,7 @@ Style/SingleArgumentDig: - 'ee/app/workers/concerns/elastic/migration_helper.rb' - 'ee/lib/gitlab/ci/parsers/security/dependency_list.rb' - 'ee/lib/gitlab/subscription_portal/clients/graphql.rb' + - 'ee/spec/elastic/migrate/20220119120500_populate_commit_permissions_in_main_index_spec.rb' - 'ee/spec/graphql/mutations/vulnerabilities/create_spec.rb' - 'ee/spec/lib/ee/gitlab/ci/parsers/security/common_spec.rb' - 'ee/spec/lib/ee/gitlab/ci/pipeline/chain/validate/external_spec.rb' @@ -35,10 +34,11 @@ Style/SingleArgumentDig: - 'ee/spec/requests/api/graphql/project/dast_site_profiles_spec.rb' - 'ee/spec/requests/api/graphql/project/requirements_management/requirements_spec.rb' - 'ee/spec/requests/api/internal/upcoming_reconciliations_spec.rb' + - 'ee/spec/services/vulnerabilities/findings/find_or_create_from_security_finding_service_spec.rb' - 'ee/spec/services/vulnerabilities/manually_create_service_spec.rb' + - 'lib/gitlab/auth/o_auth/auth_hash.rb' - 'lib/gitlab/ci/badge/coverage/template.rb' - - 'lib/gitlab/ci/badge/pipeline/template.rb' - - 'lib/gitlab/ci/badge/release/template.rb' + - 'lib/gitlab/ci/badge/template.rb' - 'lib/gitlab/ci/lint.rb' - 'lib/gitlab/ci/parsers/accessibility/pa11y.rb' - 'lib/gitlab/ci/parsers/security/common.rb' @@ -51,11 +51,13 @@ Style/SingleArgumentDig: - 'lib/gitlab/database/transaction/observer.rb' - 'lib/gitlab/serverless/service.rb' - 'qa/qa/specs/features/browser_ui/2_plan/email/trigger_email_notification_spec.rb' + - 'qa/qa/vendor/mail_hog/api.rb' - 'spec/controllers/graphql_controller_spec.rb' - 'spec/graphql/types/release_links_type_spec.rb' - 'spec/helpers/projects_helper_spec.rb' - 'spec/lib/gitlab/ci/yaml_processor_spec.rb' - 'spec/requests/api/ci/runner/jobs_request_post_spec.rb' + - 'spec/requests/api/graphql/ci/instance_variables_spec.rb' - 'spec/requests/api/graphql/container_repository/container_repository_details_spec.rb' - 'spec/requests/api/graphql/project/container_repositories_spec.rb' - 'spec/requests/api/graphql/project/jira_import_spec.rb' diff --git a/.rubocop_todo/style/sole_nested_conditional.yml b/.rubocop_todo/style/sole_nested_conditional.yml index 620d66a272c..535b8d20765 100644 --- a/.rubocop_todo/style/sole_nested_conditional.yml +++ b/.rubocop_todo/style/sole_nested_conditional.yml @@ -1,8 +1,7 @@ --- +# Cop supports --auto-correct. Style/SoleNestedConditional: - # Offense count: 64 - # Temporarily disabled due to too many offenses - Enabled: false + Details: grace period Exclude: - 'app/controllers/admin/application_settings_controller.rb' - 'app/controllers/ldap/omniauth_callbacks_controller.rb' @@ -17,7 +16,6 @@ Style/SoleNestedConditional: - 'app/models/network/graph.rb' - 'app/models/packages/package.rb' - 'app/models/protected_branch.rb' - - 'app/services/ci/register_job_service.rb' - 'app/services/concerns/update_visibility_level.rb' - 'app/services/incident_management/incidents/create_service.rb' - 'app/services/merge_requests/update_service.rb' @@ -27,9 +25,11 @@ Style/SoleNestedConditional: - 'app/services/projects/create_service.rb' - 'app/services/projects/hashed_storage/migration_service.rb' - 'app/services/projects/hashed_storage/rollback_service.rb' + - 'app/workers/merge_requests/delete_source_branch_worker.rb' - 'ee/app/finders/ee/snippets_finder.rb' - 'ee/app/services/ee/issue_links/create_service.rb' - 'ee/app/services/ee/lfs/unlock_file_service.rb' + - 'ee/app/services/ee/merge_requests/create_pipeline_service.rb' - 'ee/app/services/epics/tree_reorder_service.rb' - 'ee/app/services/geo/framework_repository_sync_service.rb' - 'ee/app/services/geo/repository_base_sync_service.rb' @@ -43,6 +43,7 @@ Style/SoleNestedConditional: - 'lib/api/ci/helpers/runner.rb' - 'lib/api/deploy_keys.rb' - 'lib/api/helpers/label_helpers.rb' + - 'lib/api/maven_packages.rb' - 'lib/api/users.rb' - 'lib/banzai/filter/ascii_doc_sanitization_filter.rb' - 'lib/banzai/filter/base_sanitization_filter.rb' @@ -52,7 +53,9 @@ Style/SoleNestedConditional: - 'lib/gitlab/config/entry/configurable.rb' - 'lib/gitlab/config/entry/validators.rb' - 'lib/gitlab/database/each_database.rb' + - 'lib/gitlab/database/load_balancing/load_balancer.rb' - 'lib/gitlab/email/handler/reply_processing.rb' + - 'lib/gitlab/patch/database_config.rb' - 'lib/gitlab/user_access.rb' - 'lib/gitlab/utils.rb' - 'lib/gitlab/x509/signature.rb' @@ -60,5 +63,5 @@ Style/SoleNestedConditional: - 'lib/mattermost/session.rb' - 'lib/object_storage/direct_upload.rb' - 'qa/qa/flow/login.rb' - - 'qa/qa/support/page_error_checker.rb' + - 'qa/qa/page/project/web_ide/edit.rb' - 'spec/spec_helper.rb' diff --git a/.rubocop_todo/style/special_global_vars.yml b/.rubocop_todo/style/special_global_vars.yml new file mode 100644 index 00000000000..df688872d71 --- /dev/null +++ b/.rubocop_todo/style/special_global_vars.yml @@ -0,0 +1,4 @@ +--- +# Cop supports --auto-correct. +Style/SpecialGlobalVars: + Details: grace period diff --git a/.rubocop_todo/style/string_concatenation.yml b/.rubocop_todo/style/string_concatenation.yml index 315ce3701a8..ec15edbc206 100644 --- a/.rubocop_todo/style/string_concatenation.yml +++ b/.rubocop_todo/style/string_concatenation.yml @@ -263,9 +263,9 @@ Style/StringConcatenation: - 'spec/models/custom_emoji_spec.rb' - 'spec/models/grafana_integration_spec.rb' - 'spec/models/integrations/campfire_spec.rb' + - 'spec/models/integrations/datadog_spec.rb' - 'spec/models/integrations/chat_message/pipeline_message_spec.rb' - 'spec/models/integrations/chat_message/push_message_spec.rb' - - 'spec/models/integrations/datadog_spec.rb' - 'spec/models/integrations/jenkins_spec.rb' - 'spec/models/merge_request_diff_spec.rb' - 'spec/models/merge_request_spec.rb' diff --git a/.rubocop_todo/style/string_literals_in_interpolation.yml b/.rubocop_todo/style/string_literals_in_interpolation.yml index cded81afa7f..fc90e1ce6a6 100644 --- a/.rubocop_todo/style/string_literals_in_interpolation.yml +++ b/.rubocop_todo/style/string_literals_in_interpolation.yml @@ -1,9 +1,7 @@ --- # Cop supports --auto-correct. Style/StringLiteralsInInterpolation: - # Offense count: 119 - # Temporarily disabled due to too many offenses - Enabled: false + Details: grace period Exclude: - 'app/graphql/mutations/base_mutation.rb' - 'app/helpers/colors_helper.rb' @@ -23,11 +21,16 @@ Style/StringLiteralsInInterpolation: - 'ee/app/helpers/ee/merge_requests_helper.rb' - 'ee/app/models/license.rb' - 'ee/app/services/epics/tree_reorder_service.rb' + - 'ee/lib/ee/api/helpers/issues_helpers.rb' - 'ee/lib/gitlab/elastic/helper.rb' + - 'ee/lib/tasks/gitlab/elastic.rake' - 'ee/spec/features/admin/admin_settings_spec.rb' + - 'ee/spec/features/subscriptions/expiring_subscription_message_spec.rb' + - 'ee/spec/lib/gitlab/expiring_subscription_message_spec.rb' - 'lib/api/helpers/snippets_helpers.rb' - 'lib/api/validations/validators/check_assignees_count.rb' - 'lib/banzai/filter/references/abstract_reference_filter.rb' + - 'lib/banzai/filter/syntax_highlight_filter.rb' - 'lib/generators/gitlab/usage_metric_definition_generator.rb' - 'lib/gitlab/background_migration/fix_projects_without_prometheus_service.rb' - 'lib/gitlab/ci/config/entry/job.rb' @@ -36,6 +39,7 @@ Style/StringLiteralsInInterpolation: - 'lib/gitlab/database/query_analyzers/prevent_cross_database_modification.rb' - 'lib/gitlab/doctor/secrets.rb' - 'lib/gitlab/endpoint_attributes/config.rb' + - 'lib/gitlab/gitaly_client/ref_service.rb' - 'lib/gitlab/graphql/queries.rb' - 'lib/gitlab/quick_actions/extractor.rb' - 'lib/gitlab/sanitizers/exif.rb' @@ -43,13 +47,11 @@ Style/StringLiteralsInInterpolation: - 'lib/gitlab/tracking/destinations/snowplow.rb' - 'lib/tasks/gitlab/info.rake' - 'lib/tasks/gitlab/sidekiq.rake' - - 'lib/tasks/gitlab/tw/codeowners.rake' - 'qa/qa/ee/page/component/secure_report.rb' - 'qa/qa/ee/page/group/secure/show.rb' - 'qa/qa/resource/events/base.rb' - 'qa/qa/service/cluster_provider/base.rb' - 'qa/qa/service/cluster_provider/gcloud.rb' - - 'qa/qa/service/docker_run/gitlab_runner.rb' - 'qa/qa/specs/helpers/context_selector.rb' - 'qa/qa/tools/generate_perf_testdata.rb' - 'rubocop/cop/migration/prevent_index_creation.rb' @@ -59,9 +61,12 @@ Style/StringLiteralsInInterpolation: - 'spec/finders/serverless_domain_finder_spec.rb' - 'spec/lib/banzai/filter/references/commit_reference_filter_spec.rb' - 'spec/lib/banzai/filter/references/issue_reference_filter_spec.rb' + - 'spec/lib/gitlab/background_migration/batched_migration_job_spec.rb' - 'spec/lib/gitlab/ci/parsers/security/validators/schema_validator_spec.rb' - 'spec/lib/gitlab/database/partitioning_migration_helpers/table_management_helpers_spec.rb' + - 'spec/lib/gitlab/gitaly_client/ref_service_spec.rb' - 'spec/lib/object_storage/direct_upload_spec.rb' - 'spec/models/serverless/domain_spec.rb' - 'spec/requests/api/keys_spec.rb' - 'spec/support/database/prevent_cross_joins.rb' + - 'spec/views/notify/import_issues_csv_email.html.haml_spec.rb' diff --git a/.rubocop_todo/style/symbol_proc.yml b/.rubocop_todo/style/symbol_proc.yml index bfb3867b127..d373788dbc6 100644 --- a/.rubocop_todo/style/symbol_proc.yml +++ b/.rubocop_todo/style/symbol_proc.yml @@ -70,8 +70,6 @@ Style/SymbolProc: - 'app/services/clusters/agents/delete_expired_events_service.rb' - 'app/services/feature_flags/update_service.rb' - 'app/services/merge_requests/base_service.rb' - - 'app/services/merge_requests/bulk_remove_attention_requested_service.rb' - - 'app/services/merge_requests/reopen_service.rb' - 'app/services/notes/destroy_service.rb' - 'app/services/packages/debian/generate_distribution_service.rb' - 'app/services/resource_events/synthetic_label_notes_builder_service.rb' @@ -87,7 +85,6 @@ Style/SymbolProc: - 'config/initializers/01_active_record_database_tasks_configuration_flag.rb' - 'config/initializers/doorkeeper_openid_connect.rb' - 'config/initializers/mail_encoding_patch.rb' - - 'config/initializers/wikicloth_redos_patch.rb' - 'config/settings.rb' - 'db/migrate/20210318134427_delete_security_findings_without_uuid.rb' - 'db/migrate/20210503105845_add_project_value_stream_id_to_project_stages.rb' @@ -136,7 +133,6 @@ Style/SymbolProc: - 'ee/spec/helpers/ee/registrations_helper_spec.rb' - 'ee/spec/lib/ee/gitlab/search_results_spec.rb' - 'ee/spec/lib/gitlab/elastic/document_reference_spec.rb' - - 'ee/spec/models/ee/iterations/cadence_spec.rb' - 'ee/spec/services/groups/participants_service_spec.rb' - 'ee/spec/support/helpers/subscription_portal_helpers.rb' - 'ee/spec/support/shared_examples/lib/gitlab/graphql/issuables_lazy_links_aggregate_shared_examples.rb' @@ -205,17 +201,13 @@ Style/SymbolProc: - 'qa/qa/specs/features/browser_ui/3_create/web_ide/review_merge_request_spec.rb' - 'qa/qa/specs/features/browser_ui/4_verify/ci_variable/custom_variable_spec.rb' - 'qa/qa/specs/features/browser_ui/5_package/container_registry/online_garbage_collection_spec.rb' - - 'qa/qa/specs/features/ee/browser_ui/12_geo/attachment_replication_spec.rb' - - 'qa/qa/specs/features/ee/browser_ui/12_geo/http_push_spec.rb' - - 'qa/qa/specs/features/ee/browser_ui/12_geo/rename_replication_spec.rb' - - 'qa/qa/specs/features/ee/browser_ui/12_geo/ssh_push_spec.rb' - - 'qa/qa/specs/features/ee/browser_ui/12_geo/wiki_http_push_spec.rb' - 'qa/qa/specs/features/ee/browser_ui/13_secure/enable_scanning_from_configuration_spec.rb' - 'qa/qa/specs/features/ee/browser_ui/3_create/merge_request/approval_rules_spec.rb' - 'qa/qa/specs/features/ee/browser_ui/3_create/repository/file_locking_spec.rb' - 'qa/qa/specs/features/ee/browser_ui/4_verify/pipeline_status_on_operation_dashboard_spec.rb' - 'qa/qa/specs/features/ee/browser_ui/4_verify/pipeline_subscription_with_group_owned_project_spec.rb' - 'rubocop/cop/gitlab/mark_used_feature_flags.rb' + - 'rubocop/cop/gitlab/namespaced_class.rb' - 'scripts/qa/testcases-check' - 'scripts/static-analysis' - 'spec/controllers/concerns/product_analytics_tracking_spec.rb' @@ -245,7 +237,6 @@ Style/SymbolProc: - 'spec/lib/gitlab/database/loose_foreign_keys_spec.rb' - 'spec/lib/gitlab/database/migration_helpers/loose_foreign_key_helpers_spec.rb' - 'spec/lib/gitlab/git/commit_spec.rb' - - 'spec/lib/gitlab/git/repository_spec.rb' - 'spec/lib/gitlab/gpg/invalid_gpg_signature_updater_spec.rb' - 'spec/lib/gitlab/graphql/lazy_spec.rb' - 'spec/lib/gitlab/graphql/markdown_field_spec.rb' @@ -272,7 +263,6 @@ Style/SymbolProc: - 'spec/services/merge_requests/conflicts/list_service_spec.rb' - 'spec/services/notification_recipients/builder/default_spec.rb' - 'spec/services/packages/go/create_package_service_spec.rb' - - 'spec/services/suggestions/apply_service_spec.rb' - 'spec/spec_helper.rb' - 'spec/support/generate-seed-repo-rb' - 'spec/support/helpers/filter_spec_helper.rb' |