From fb4b2fb639921cc95aa90b26e9916835508ea0e8 Mon Sep 17 00:00:00 2001 From: Siddharth Asthana Date: Fri, 5 Aug 2022 16:57:41 +0530 Subject: [PATCH 1/2] RuboCop: Enable previously disabled Style/PercentLiteralDelimiters Changelog: other --- .../style/percent_literal_delimiters.yml | 86 +++++++++++++------ 1 file changed, 59 insertions(+), 27 deletions(-) diff --git a/.rubocop_todo/style/percent_literal_delimiters.yml b/.rubocop_todo/style/percent_literal_delimiters.yml index 16ae8989c9799e..ae019079a8db92 100644 --- a/.rubocop_todo/style/percent_literal_delimiters.yml +++ b/.rubocop_todo/style/percent_literal_delimiters.yml @@ -1,9 +1,6 @@ --- # Cop supports --auto-correct. Style/PercentLiteralDelimiters: - # Offense count: 3136 - # Temporarily disabled due to too many offenses - Enabled: false Exclude: - 'Guardfile' - 'app/controllers/abuse_reports_controller.rb' @@ -85,6 +82,7 @@ Style/PercentLiteralDelimiters: - 'app/models/concerns/clusters/agents/authorization_config_scopes.rb' - 'app/models/concerns/diff_positionable_note.rb' - 'app/models/concerns/enums/prometheus_metric.rb' + - 'app/models/concerns/integrations/base_data_fields.rb' - 'app/models/concerns/issuable.rb' - 'app/models/concerns/issue_available_features.rb' - 'app/models/concerns/mentionable/reference_regexes.rb' @@ -98,11 +96,11 @@ Style/PercentLiteralDelimiters: - 'app/models/diff_note.rb' - 'app/models/discussion_note.rb' - 'app/models/draft_note.rb' + - 'app/models/environment.rb' - 'app/models/event.rb' - 'app/models/instance_configuration.rb' - 'app/models/integrations/asana.rb' - 'app/models/integrations/assembla.rb' - - 'app/models/integrations/base_ci.rb' - 'app/models/integrations/base_issue_tracker.rb' - 'app/models/integrations/base_monitoring.rb' - 'app/models/integrations/base_slash_commands.rb' @@ -125,6 +123,7 @@ Style/PercentLiteralDelimiters: - 'app/models/issuable_severity.rb' - 'app/models/issue.rb' - 'app/models/lfs_download_object.rb' + - 'app/models/namespace.rb' - 'app/models/namespace/root_storage_statistics.rb' - 'app/models/note.rb' - 'app/models/notification_setting.rb' @@ -153,6 +152,7 @@ Style/PercentLiteralDelimiters: - 'app/services/feature_flags/base_service.rb' - 'app/services/files/multi_service.rb' - 'app/services/import/bitbucket_server_service.rb' + - 'app/services/import/fogbugz_service.rb' - 'app/services/import/github_service.rb' - 'app/services/import/gitlab_projects/file_acquisition_strategies/remote_file.rb' - 'app/services/import/gitlab_projects/file_acquisition_strategies/remote_file_s3.rb' @@ -172,13 +172,13 @@ Style/PercentLiteralDelimiters: - 'app/services/projects/update_service.rb' - 'app/services/prometheus/proxy_service.rb' - 'app/services/repositories/base_service.rb' - - 'app/services/repositories/destroy_service.rb' - 'app/services/repository_archive_clean_up_service.rb' - 'app/services/resource_access_tokens/create_service.rb' - 'app/services/resource_access_tokens/revoke_service.rb' - 'app/services/search/global_service.rb' - 'app/services/search/project_service.rb' - 'app/services/snippets/update_service.rb' + - 'app/services/todos/destroy/destroyed_issuable_service.rb' - 'app/services/todos/destroy/entity_leave_service.rb' - 'app/uploaders/design_management/design_v432x230_uploader.rb' - 'app/uploaders/gitlab_uploader.rb' @@ -194,6 +194,7 @@ Style/PercentLiteralDelimiters: - 'config/initializers/content_security_policy.rb' - 'config/initializers/countries.rb' - 'config/initializers/doorkeeper.rb' + - 'config/initializers/enumerator_next_patch.rb' - 'config/initializers/fog_core_patch.rb' - 'config/initializers/forbid_sidekiq_in_transactions.rb' - 'config/initializers/health_check.rb' @@ -234,6 +235,8 @@ Style/PercentLiteralDelimiters: - 'ee/app/controllers/ee/admin/application_settings_controller.rb' - 'ee/app/controllers/ee/projects/service_desk_controller.rb' - 'ee/app/controllers/ee/repositories/git_http_client_controller.rb' + - 'ee/app/controllers/groups/protected_environments_controller.rb' + - 'ee/app/controllers/projects/integrations/jira/issues_controller.rb' - 'ee/app/controllers/projects/protected_environments_controller.rb' - 'ee/app/controllers/trials_controller.rb' - 'ee/app/finders/iterations_finder.rb' @@ -241,6 +244,7 @@ Style/PercentLiteralDelimiters: - 'ee/app/helpers/credentials_inventory_helper.rb' - 'ee/app/helpers/ee/auth_helper.rb' - 'ee/app/helpers/ee/dashboard_helper.rb' + - 'ee/app/helpers/ee/integrations_helper.rb' - 'ee/app/helpers/ee/issues_helper.rb' - 'ee/app/helpers/ee/labels_helper.rb' - 'ee/app/helpers/ee/nav_helper.rb' @@ -264,12 +268,13 @@ Style/PercentLiteralDelimiters: - 'ee/app/models/geo/project_registry.rb' - 'ee/app/models/geo/secondary_usage_data.rb' - 'ee/app/models/geo_node_status.rb' - - 'ee/app/models/gitlab_subscription.rb' + - 'ee/app/models/incident_management/issuable_resource_link.rb' - 'ee/app/models/integrations/github.rb' - 'ee/app/models/integrations/gitlab_slack_application.rb' - 'ee/app/models/merge_requests/status_check_response.rb' - 'ee/app/models/saml_provider.rb' - 'ee/app/models/security/orchestration_policy_configuration.rb' + - 'ee/app/models/software_license_policy.rb' - 'ee/app/models/storage_shard.rb' - 'ee/app/services/approval_rules/create_service.rb' - 'ee/app/services/boards/epic_boards/update_service.rb' @@ -284,11 +289,13 @@ Style/PercentLiteralDelimiters: - 'ee/app/services/requirements_management/export_csv_service.rb' - 'ee/app/services/security/configuration/save_auto_fix_service.rb' - 'ee/app/services/security/dependency_list_service.rb' - - 'ee/lib/api/managed_licenses.rb' + - 'ee/app/services/security/ingestion/tasks/update_vulnerability_uuids.rb' + - 'ee/elastic/migrate/20220613120500_migrate_commits_to_separate_index.rb' - 'ee/lib/api/status_checks.rb' - 'ee/lib/api/visual_review_discussions.rb' - 'ee/lib/ee/api/helpers/members_helpers.rb' - 'ee/lib/ee/api/helpers/projects_helpers.rb' + - 'ee/lib/ee/api/members.rb' - 'ee/lib/ee/api/search.rb' - 'ee/lib/ee/audit/group_changes_auditor.rb' - 'ee/lib/ee/gitlab/alert_management/payload/generic.rb' @@ -320,6 +327,7 @@ Style/PercentLiteralDelimiters: - 'ee/spec/controllers/groups/scim_oauth_controller_spec.rb' - 'ee/spec/controllers/groups/sso_controller_spec.rb' - 'ee/spec/controllers/projects/issues_controller_spec.rb' + - 'ee/spec/controllers/projects/legacy_pipelines_controller_spec.rb' - 'ee/spec/controllers/projects/pipelines_controller_spec.rb' - 'ee/spec/controllers/projects/security/configuration_controller_spec.rb' - 'ee/spec/elastic_integration/global_search_spec.rb' @@ -349,6 +357,7 @@ Style/PercentLiteralDelimiters: - 'ee/spec/graphql/types/vulnerable_projects_by_grade_type_spec.rb' - 'ee/spec/helpers/ee/application_settings_helper_spec.rb' - 'ee/spec/helpers/ee/auth_helper_spec.rb' + - 'ee/spec/helpers/ee/environments_helper_spec.rb' - 'ee/spec/helpers/ee/geo_helper_spec.rb' - 'ee/spec/helpers/ee/labels_helper_spec.rb' - 'ee/spec/helpers/ee/security_orchestration_helper_spec.rb' @@ -359,6 +368,7 @@ Style/PercentLiteralDelimiters: - 'ee/spec/lib/banzai/filter/references/epic_reference_filter_spec.rb' - 'ee/spec/lib/banzai/filter/references/iteration_reference_filter_spec.rb' - 'ee/spec/lib/banzai/filter/references/vulnerability_reference_filters_spec.rb' + - 'ee/spec/lib/ee/backup/repositories_spec.rb' - 'ee/spec/lib/ee/gitlab/alert_management/payload/generic_spec.rb' - 'ee/spec/lib/ee/gitlab/auth/ldap/access_levels_spec.rb' - 'ee/spec/lib/ee/gitlab/auth/ldap/config_spec.rb' @@ -367,7 +377,6 @@ Style/PercentLiteralDelimiters: - 'ee/spec/lib/ee/gitlab/auth/ldap/sync/group_spec.rb' - 'ee/spec/lib/ee/gitlab/auth/ldap/sync/groups_spec.rb' - 'ee/spec/lib/ee/gitlab/ci/reports/security/reports_spec.rb' - - 'ee/spec/lib/ee/gitlab/elastic/helper_spec.rb' - 'ee/spec/lib/ee/gitlab/git_access_design_spec.rb' - 'ee/spec/lib/ee/gitlab/git_access_snippet_spec.rb' - 'ee/spec/lib/ee/gitlab/security/scan_configuration_spec.rb' @@ -380,6 +389,7 @@ Style/PercentLiteralDelimiters: - 'ee/spec/lib/gitlab/auth/group_saml/user_spec.rb' - 'ee/spec/lib/gitlab/auth/ldap/adapter_spec.rb' - 'ee/spec/lib/gitlab/auth/ldap/person_spec.rb' + - 'ee/spec/lib/gitlab/auth/saml/membership_updater_spec.rb' - 'ee/spec/lib/gitlab/auth/saml/user_spec.rb' - 'ee/spec/lib/gitlab/authority_analyzer_spec.rb' - 'ee/spec/lib/gitlab/cache_spec.rb' @@ -387,7 +397,7 @@ Style/PercentLiteralDelimiters: - 'ee/spec/lib/gitlab/ci/templates/Jobs/dast_default_branch_gitlab_ci_yaml_spec.rb' - 'ee/spec/lib/gitlab/ci/templates/dependency_scanning_gitlab_ci_yaml_spec.rb' - 'ee/spec/lib/gitlab/ci/templates/sast_gitlab_ci_yaml_spec.rb' - - 'ee/spec/lib/gitlab/ci/templates/sast_iac_latest_gitlab_ci_yaml_spec.rb' + - 'ee/spec/lib/gitlab/ci/templates/sast_iac_gitlab_ci_yaml_spec.rb' - 'ee/spec/lib/gitlab/ci/templates/sast_latest_gitlab_ci_yaml_spec.rb' - 'ee/spec/lib/gitlab/ci/templates/secret_detection_gitlab_ci_yaml_spec.rb' - 'ee/spec/lib/gitlab/ci/templates/secret_detection_latest_gitlab_ci_yaml_spec.rb' @@ -411,11 +421,11 @@ Style/PercentLiteralDelimiters: - 'ee/spec/models/concerns/ee/issuable_spec.rb' - 'ee/spec/models/concerns/ee/project_security_scanners_information_spec.rb' - 'ee/spec/models/ee/ci/job_artifact_spec.rb' + - 'ee/spec/models/ee/ci/runner_spec.rb' - 'ee/spec/models/ee/groups/feature_setting_spec.rb' - 'ee/spec/models/ee/integration_spec.rb' - 'ee/spec/models/ee/integrations/jira_spec.rb' - 'ee/spec/models/ee/personal_access_token_spec.rb' - - 'ee/spec/models/gitlab_subscription_spec.rb' - 'ee/spec/models/instance_security_dashboard_spec.rb' - 'ee/spec/models/issue_spec.rb' - 'ee/spec/models/project_feature_spec.rb' @@ -423,7 +433,6 @@ Style/PercentLiteralDelimiters: - 'ee/spec/models/push_rule_spec.rb' - 'ee/spec/models/repository_spec.rb' - 'ee/spec/models/saml_provider_spec.rb' - - 'ee/spec/models/security/orchestration_policy_configuration_spec.rb' - 'ee/spec/models/security/scan_spec.rb' - 'ee/spec/models/vulnerabilities/historical_statistic_spec.rb' - 'ee/spec/models/vulnerabilities/stat_diff_spec.rb' @@ -435,6 +444,7 @@ Style/PercentLiteralDelimiters: - 'ee/spec/requests/admin/user_permission_exports_controller_spec.rb' - 'ee/spec/requests/api/dependencies_spec.rb' - 'ee/spec/requests/api/epics_spec.rb' + - 'ee/spec/requests/api/geo_spec.rb' - 'ee/spec/requests/api/graphql/mutations/alert_management/http_integration/update_spec.rb' - 'ee/spec/requests/api/graphql/project/alert_management/http_integrations_spec.rb' - 'ee/spec/requests/api/internal/base_spec.rb' @@ -443,11 +453,13 @@ Style/PercentLiteralDelimiters: - 'ee/spec/requests/api/merge_requests_spec.rb' - 'ee/spec/requests/api/scim_spec.rb' - 'ee/spec/requests/api/wikis_spec.rb' + - 'ee/spec/requests/lfs_locks_api_spec.rb' - 'ee/spec/serializers/merge_request_widget_entity_spec.rb' - 'ee/spec/services/admin/email_service_spec.rb' - 'ee/spec/services/base_count_service_spec.rb' - 'ee/spec/services/ci/compare_security_reports_service_spec.rb' - 'ee/spec/services/ci/sync_reports_to_approval_rules_service_spec.rb' + - 'ee/spec/services/ee/auth/container_registry_authentication_service_spec.rb' - 'ee/spec/services/ee/groups/autocomplete_service_spec.rb' - 'ee/spec/services/ee/members/create_service_spec.rb' - 'ee/spec/services/ee/protected_branches/create_service_spec.rb' @@ -507,6 +519,7 @@ Style/PercentLiteralDelimiters: - 'lib/banzai/filter/table_of_contents_filter.rb' - 'lib/banzai/pipeline/base_pipeline.rb' - 'lib/banzai/pipeline/description_pipeline.rb' + - 'lib/banzai/pipeline/incident_management/timeline_event_pipeline.rb' - 'lib/bitbucket/page.rb' - 'lib/bitbucket/representation/issue.rb' - 'lib/container_registry/path.rb' @@ -520,6 +533,7 @@ Style/PercentLiteralDelimiters: - 'lib/gitlab/asciidoc/syntax_highlighter/html_pipeline_adapter.rb' - 'lib/gitlab/auth/ldap/adapter.rb' - 'lib/gitlab/auth/ldap/config.rb' + - 'lib/gitlab/background_migration/backfill_note_discussion_id.rb' - 'lib/gitlab/bare_repository_import/importer.rb' - 'lib/gitlab/ci/ansi2html.rb' - 'lib/gitlab/ci/config/entry/bridge.rb' @@ -547,7 +561,7 @@ Style/PercentLiteralDelimiters: - 'lib/gitlab/gitaly_client.rb' - 'lib/gitlab/gitaly_client/diff.rb' - 'lib/gitlab/gitaly_client/wiki_page.rb' - - 'lib/gitlab/graphql/pagination/keyset/order_info.rb' + - 'lib/gitlab/graphql/query_analyzers/ast/recursion_analyzer.rb' - 'lib/gitlab/hotlinking_detector.rb' - 'lib/gitlab/import_export/command_line_util.rb' - 'lib/gitlab/import_export/file_importer.rb' @@ -568,9 +582,10 @@ Style/PercentLiteralDelimiters: - 'lib/gitlab/metrics/transaction.rb' - 'lib/gitlab/metrics/web_transaction.rb' - 'lib/gitlab/middleware/read_only/controller.rb' - - 'lib/gitlab/process_supervisor.rb' - 'lib/gitlab/project_search_results.rb' - 'lib/gitlab/prometheus/query_variables.rb' + - 'lib/gitlab/query_limiting/transaction.rb' + - 'lib/gitlab/redis/multi_store.rb' - 'lib/gitlab/reference_extractor.rb' - 'lib/gitlab/regex.rb' - 'lib/gitlab/sanitizers/exception_message.rb' @@ -584,11 +599,14 @@ Style/PercentLiteralDelimiters: - 'lib/gitlab/task_helpers.rb' - 'lib/gitlab/uploads/migration_helper.rb' - 'lib/gitlab/url_blocker.rb' + - 'lib/gitlab/usage/metrics/instrumentations/count_imported_projects_total_metric.rb' - 'lib/gitlab/usage/metrics/instrumentations/database_metric.rb' + - 'lib/gitlab/usage/metrics/instrumentations/numbers_metric.rb' - 'lib/gitlab/usage_data.rb' - 'lib/gitlab/usage_data/topology.rb' - 'lib/gitlab/usage_data_counters/hll_redis_counter.rb' - 'lib/gitlab/utils/sanitize_node_link.rb' + - 'lib/gitlab/web_hooks/rate_limiter.rb' - 'lib/gitlab/workhorse.rb' - 'lib/grafana/validator.rb' - 'lib/omni_auth/strategies/jwt.rb' @@ -614,40 +632,37 @@ Style/PercentLiteralDelimiters: - 'qa/qa/ee/page/project/show.rb' - 'qa/qa/ee/page/project/snippet/index.rb' - 'qa/qa/ee/page/project/wiki/show.rb' - - 'qa/qa/git/repository.rb' - 'qa/qa/resource/events/project.rb' - - 'qa/qa/resource/members.rb' + - 'qa/qa/resource/personal_access_token_cache.rb' - 'qa/qa/resource/visibility.rb' - - 'qa/qa/runtime/browser.rb' - 'qa/qa/service/cluster_provider/gcloud.rb' - 'qa/qa/service/praefect_manager.rb' - 'qa/qa/specs/features/api/3_create/gitaly/praefect_repo_sync_spec.rb' - 'qa/qa/specs/features/api/3_create/repository/project_archive_compare_spec.rb' - 'qa/qa/specs/features/browser_ui/2_plan/email/trigger_email_notification_spec.rb' - - 'qa/qa/specs/features/ee/browser_ui/13_secure/enable_scanning_from_configuration_spec.rb' - - 'qa/qa/specs/features/ee/browser_ui/1_manage/group/group_saml_enforced_sso_new_account_spec.rb' + - 'qa/qa/specs/features/browser_ui/4_verify/pipeline/pipeline_with_image_pull_policy_spec.rb' - 'qa/qa/specs/features/ee/browser_ui/3_create/repository/push_rules_spec.rb' - 'qa/spec/git/repository_spec.rb' - 'qa/spec/page/view_spec.rb' - - 'qa/spec/support/page_error_checker_spec.rb' + - 'rubocop/cop/migration/background_migrations.rb' - 'rubocop/cop/rspec/httparty_basic_auth.rb' - 'rubocop/migration_helpers.rb' + - 'scripts/qa/quarantine-types-check' - 'scripts/qa/testcases-check' - 'scripts/regenerate-schema' + - 'scripts/undercoverage' - 'sidekiq_cluster/cli.rb' - 'spec/benchmarks/banzai_benchmark.rb' - 'spec/commands/sidekiq_cluster/cli_spec.rb' + - 'spec/components/pajamas/component_spec.rb' - 'spec/config/mail_room_spec.rb' - - 'spec/controllers/admin/clusters_controller_spec.rb' - 'spec/controllers/concerns/continue_params_spec.rb' - 'spec/controllers/graphql_controller_spec.rb' - - 'spec/controllers/groups/clusters_controller_spec.rb' - 'spec/controllers/groups/releases_controller_spec.rb' - 'spec/controllers/jira_connect/app_descriptor_controller_spec.rb' - 'spec/controllers/oauth/applications_controller_spec.rb' - 'spec/controllers/profiles/two_factor_auths_controller_spec.rb' - 'spec/controllers/projects/artifacts_controller_spec.rb' - - 'spec/controllers/projects/clusters_controller_spec.rb' - 'spec/controllers/projects/deploy_keys_controller_spec.rb' - 'spec/controllers/projects/environments/prometheus_api_controller_spec.rb' - 'spec/controllers/projects/environments_controller_spec.rb' @@ -663,7 +678,6 @@ Style/PercentLiteralDelimiters: - 'spec/controllers/search_controller_spec.rb' - 'spec/controllers/snippets_controller_spec.rb' - 'spec/db/docs_spec.rb' - - 'spec/db/schema_spec.rb' - 'spec/experiments/ios_specific_templates_experiment_spec.rb' - 'spec/factories/ci/builds.rb' - 'spec/factories/ci/runners.rb' @@ -689,6 +703,8 @@ Style/PercentLiteralDelimiters: - 'spec/features/projects/integrations/user_activates_jira_spec.rb' - 'spec/features/projects/jobs_spec.rb' - 'spec/features/projects/labels/issues_sorted_by_priority_spec.rb' + - 'spec/features/projects/pipelines/legacy_pipeline_spec.rb' + - 'spec/features/projects/pipelines/legacy_pipelines_spec.rb' - 'spec/features/projects/pipelines/pipeline_spec.rb' - 'spec/features/projects/pipelines/pipelines_spec.rb' - 'spec/features/protected_branches_spec.rb' @@ -700,7 +716,6 @@ Style/PercentLiteralDelimiters: - 'spec/finders/ci/runners_finder_spec.rb' - 'spec/finders/environments/environments_finder_spec.rb' - 'spec/finders/groups_finder_spec.rb' - - 'spec/finders/issues_finder_spec.rb' - 'spec/finders/license_template_finder_spec.rb' - 'spec/finders/merge_requests_finder_spec.rb' - 'spec/finders/tags_finder_spec.rb' @@ -724,19 +739,24 @@ Style/PercentLiteralDelimiters: - 'spec/helpers/clusters_helper_spec.rb' - 'spec/helpers/diff_helper_spec.rb' - 'spec/helpers/emails_helper_spec.rb' + - 'spec/helpers/issuables_description_templates_helper_spec.rb' - 'spec/helpers/issues_helper_spec.rb' - 'spec/helpers/nav_helper_spec.rb' - 'spec/helpers/page_layout_helper_spec.rb' - 'spec/helpers/profiles_helper_spec.rb' - 'spec/helpers/releases_helper_spec.rb' + - 'spec/helpers/storage_helper_spec.rb' - 'spec/helpers/tracking_helper_spec.rb' - 'spec/initializers/direct_upload_support_spec.rb' + - 'spec/initializers/enumerator_next_patch_spec.rb' - 'spec/initializers/rack_multipart_patch_spec.rb' - 'spec/lib/api/ci/helpers/runner_helpers_spec.rb' + - 'spec/lib/api/entities/user_spec.rb' - 'spec/lib/api/helpers/common_helpers_spec.rb' - 'spec/lib/atlassian/jira_connect/client_spec.rb' - 'spec/lib/backup/files_spec.rb' - 'spec/lib/backup/manager_spec.rb' + - 'spec/lib/backup/repositories_spec.rb' - 'spec/lib/banzai/filter/asset_proxy_filter_spec.rb' - 'spec/lib/banzai/filter/autolink_filter_spec.rb' - 'spec/lib/banzai/filter/broadcast_message_sanitization_filter_spec.rb' @@ -760,6 +780,7 @@ Style/PercentLiteralDelimiters: - 'spec/lib/banzai/pipeline/description_pipeline_spec.rb' - 'spec/lib/banzai/pipeline/full_pipeline_spec.rb' - 'spec/lib/banzai/pipeline/gfm_pipeline_spec.rb' + - 'spec/lib/banzai/pipeline/incident_management/timeline_event_pipeline_spec.rb' - 'spec/lib/banzai/pipeline/plain_markdown_pipeline_spec.rb' - 'spec/lib/banzai/reference_parser/base_parser_spec.rb' - 'spec/lib/banzai/reference_parser/commit_parser_spec.rb' @@ -777,6 +798,8 @@ Style/PercentLiteralDelimiters: - 'spec/lib/gitlab/auth/o_auth/user_spec.rb' - 'spec/lib/gitlab/auth/saml/auth_hash_spec.rb' - 'spec/lib/gitlab/auth/saml/user_spec.rb' + - 'spec/lib/gitlab/background_migration/batched_migration_job_spec.rb' + - 'spec/lib/gitlab/background_migration/copy_column_using_background_migration_job_spec.rb' - 'spec/lib/gitlab/bare_repository_import/importer_spec.rb' - 'spec/lib/gitlab/batch_worker_context_spec.rb' - 'spec/lib/gitlab/bitbucket_import/importer_spec.rb' @@ -784,6 +807,7 @@ Style/PercentLiteralDelimiters: - 'spec/lib/gitlab/ci/ansi2html_spec.rb' - 'spec/lib/gitlab/ci/config/entry/bridge_spec.rb' - 'spec/lib/gitlab/ci/config/entry/commands_spec.rb' + - 'spec/lib/gitlab/ci/config/entry/environment_spec.rb' - 'spec/lib/gitlab/ci/config/entry/image_spec.rb' - 'spec/lib/gitlab/ci/config/entry/root_spec.rb' - 'spec/lib/gitlab/ci/config/entry/service_spec.rb' @@ -793,6 +817,7 @@ Style/PercentLiteralDelimiters: - 'spec/lib/gitlab/ci/pipeline/chain/template_usage_spec.rb' - 'spec/lib/gitlab/ci/pipeline/expression/lexeme/equals_spec.rb' - 'spec/lib/gitlab/ci/pipeline/seed/build_spec.rb' + - 'spec/lib/gitlab/ci/pipeline/seed/deployment_spec.rb' - 'spec/lib/gitlab/ci/reports/accessibility_reports_comparer_spec.rb' - 'spec/lib/gitlab/ci/reports/accessibility_reports_spec.rb' - 'spec/lib/gitlab/ci/reports/security/reports_spec.rb' @@ -801,6 +826,7 @@ Style/PercentLiteralDelimiters: - 'spec/lib/gitlab/ci/status/stage/factory_spec.rb' - 'spec/lib/gitlab/ci/templates/5_minute_production_app_ci_yaml_spec.rb' - 'spec/lib/gitlab/ci/templates/Jobs/deploy_gitlab_ci_yaml_spec.rb' + - 'spec/lib/gitlab/ci/templates/Jobs/sast_iac_latest_gitlab_ci_yaml_spec.rb' - 'spec/lib/gitlab/ci/templates/auto_devops_gitlab_ci_yaml_spec.rb' - 'spec/lib/gitlab/ci/variables/collection/item_spec.rb' - 'spec/lib/gitlab/ci/yaml_processor/dag_spec.rb' @@ -844,7 +870,6 @@ Style/PercentLiteralDelimiters: - 'spec/lib/gitlab/favicon_spec.rb' - 'spec/lib/gitlab/feature_categories_spec.rb' - 'spec/lib/gitlab/file_detector_spec.rb' - - 'spec/lib/gitlab/form_builders/gitlab_ui_form_builder_spec.rb' - 'spec/lib/gitlab/gfm/reference_rewriter_spec.rb' - 'spec/lib/gitlab/git/merge_base_spec.rb' - 'spec/lib/gitlab/git/repository_spec.rb' @@ -887,6 +912,7 @@ Style/PercentLiteralDelimiters: - 'spec/lib/gitlab/middleware/go_spec.rb' - 'spec/lib/gitlab/middleware/multipart_spec.rb' - 'spec/lib/gitlab/omniauth_initializer_spec.rb' + - 'spec/lib/gitlab/pagination/keyset/order_spec.rb' - 'spec/lib/gitlab/pagination/offset_header_builder_spec.rb' - 'spec/lib/gitlab/path_regex_spec.rb' - 'spec/lib/gitlab/popen_spec.rb' @@ -939,6 +965,8 @@ Style/PercentLiteralDelimiters: - 'spec/lib/system_check/orphans/repository_check_spec.rb' - 'spec/lib/system_check/sidekiq_check_spec.rb' - 'spec/lib/tasks/gitlab/metrics_exporter_task_spec.rb' + - 'spec/lib/unnested_in_filters/dsl_spec.rb' + - 'spec/lib/unnested_in_filters/rewriter_spec.rb' - 'spec/metrics_server/metrics_server_spec.rb' - 'spec/migrations/add_new_trail_plans_spec.rb' - 'spec/migrations/change_web_hook_events_default_spec.rb' @@ -984,7 +1012,6 @@ Style/PercentLiteralDelimiters: - 'spec/models/issue_spec.rb' - 'spec/models/members/member_task_spec.rb' - 'spec/models/merge_request_diff_spec.rb' - - 'spec/models/namespace_spec.rb' - 'spec/models/namespace_statistics_spec.rb' - 'spec/models/packages/package_spec.rb' - 'spec/models/packages/tag_spec.rb' @@ -1020,6 +1047,8 @@ Style/PercentLiteralDelimiters: - 'spec/requests/api/ci/triggers_spec.rb' - 'spec/requests/api/container_repositories_spec.rb' - 'spec/requests/api/deployments_spec.rb' + - 'spec/requests/api/geo_spec.rb' + - 'spec/requests/api/graphql/ci/manual_variables_spec.rb' - 'spec/requests/api/graphql/gitlab_schema_spec.rb' - 'spec/requests/api/graphql/group/container_repositories_spec.rb' - 'spec/requests/api/graphql/group/milestones_spec.rb' @@ -1045,6 +1074,7 @@ Style/PercentLiteralDelimiters: - 'spec/requests/api/issues/put_projects_issues_spec.rb' - 'spec/requests/api/members_spec.rb' - 'spec/requests/api/merge_requests_spec.rb' + - 'spec/requests/api/metadata_spec.rb' - 'spec/requests/api/project_container_repositories_spec.rb' - 'spec/requests/api/project_templates_spec.rb' - 'spec/requests/api/projects_spec.rb' @@ -1063,6 +1093,7 @@ Style/PercentLiteralDelimiters: - 'spec/requests/lfs_locks_api_spec.rb' - 'spec/requests/users_controller_spec.rb' - 'spec/routing/uploads_routing_spec.rb' + - 'spec/rubocop/cop/migration/migration_record_spec.rb' - 'spec/rubocop/cop/migration/prevent_index_creation_spec.rb' - 'spec/rubocop/cop/migration/sidekiq_queue_migrate_spec.rb' - 'spec/rubocop/cop/performance/readlines_each_spec.rb' @@ -1143,6 +1174,7 @@ Style/PercentLiteralDelimiters: - 'spec/support/shared_examples/features/wiki/user_creates_wiki_page_shared_examples.rb' - 'spec/support/shared_examples/features/wiki/user_updates_wiki_page_shared_examples.rb' - 'spec/support/shared_examples/features/wiki/user_views_wiki_page_shared_examples.rb' + - 'spec/support/shared_examples/finders/issues_finder_shared_examples.rb' - 'spec/support/shared_examples/lib/banzai/filters/sanitization_filter_shared_examples.rb' - 'spec/support/shared_examples/lib/gitlab/middleware/multipart_shared_examples.rb' - 'spec/support/shared_examples/metrics/transaction_metrics_with_labels_shared_examples.rb' @@ -1165,6 +1197,7 @@ Style/PercentLiteralDelimiters: - 'spec/tasks/gitlab/db_rake_spec.rb' - 'spec/tasks/gitlab/task_helpers_spec.rb' - 'spec/tasks/gitlab/uploads/migrate_rake_spec.rb' + - 'spec/tooling/danger/customer_success_spec.rb' - 'spec/tooling/danger/datateam_spec.rb' - 'spec/tooling/danger/sidekiq_queues_spec.rb' - 'spec/tooling/lib/tooling/test_map_generator_spec.rb' @@ -1186,7 +1219,6 @@ Style/PercentLiteralDelimiters: - 'spec/uploaders/pages/deployment_uploader_spec.rb' - 'spec/uploaders/personal_file_uploader_spec.rb' - 'spec/validators/any_field_validator_spec.rb' - - 'spec/views/layouts/_flash.html.haml_spec.rb' - 'spec/views/layouts/_head.html.haml_spec.rb' - 'spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb' - 'spec/views/projects/commit/branches.html.haml_spec.rb' -- GitLab From 0d11712fff7b86f709e903b5f84939ce3078584f Mon Sep 17 00:00:00 2001 From: Peter Leitzen Date: Wed, 10 Aug 2022 14:36:05 +0200 Subject: [PATCH 2/2] Fix RuboCop offenses for Style/PercentLiteralDelimiters in HAML --- app/views/layouts/nav/sidebar/_admin.html.haml | 6 +++--- app/views/search/_results.html.haml | 2 +- ee/app/views/layouts/nav/ee/admin/_geo_sidebar.html.haml | 4 ++-- .../_slack_integration_form.html.haml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/views/layouts/nav/sidebar/_admin.html.haml b/app/views/layouts/nav/sidebar/_admin.html.haml index 02565a8f573b9e..f3f7975064301b 100644 --- a/app/views/layouts/nav/sidebar/_admin.html.haml +++ b/app/views/layouts/nav/sidebar/_admin.html.haml @@ -7,14 +7,14 @@ %span.sidebar-context-title = _('Admin Area') %ul.sidebar-top-level-items{ data: { qa_selector: 'admin_sidebar_overview_submenu_content' } } - = nav_link(controller: %w(dashboard admin admin/projects users groups admin/topics jobs runners gitaly_servers cohorts), html_options: {class: 'home'}) do + = nav_link(controller: %w[dashboard admin admin/projects users groups admin/topics jobs runners gitaly_servers cohorts], html_options: {class: 'home'}) do = link_to admin_root_path, class: 'has-sub-items' do .nav-icon-container = sprite_icon('overview') %span.nav-item-name = _('Overview') %ul.sidebar-sub-level-items - = nav_link(controller: %w(dashboard admin admin/projects users groups jobs runners gitaly_servers cohorts), html_options: { class: "fly-out-top-item" } ) do + = nav_link(controller: %w[dashboard admin admin/projects users groups jobs runners gitaly_servers cohorts], html_options: { class: "fly-out-top-item" } ) do = link_to admin_root_path do %strong.fly-out-top-item-name = _('Overview') @@ -27,7 +27,7 @@ = link_to admin_projects_path, title: _('Projects') do %span = _('Projects') - = nav_link(controller: %w(users cohorts)) do + = nav_link(controller: %w[users cohorts]) do = link_to admin_users_path, title: _('Users'), data: { qa_selector: 'users_overview_link' } do %span = _('Users') diff --git a/app/views/search/_results.html.haml b/app/views/search/_results.html.haml index d5d3cd753f3247..168f4ca10bc636 100644 --- a/app/views/search/_results.html.haml +++ b/app/views/search/_results.html.haml @@ -3,7 +3,7 @@ = render partial: 'search/results_status', locals: { search_service: @search_service } unless @search_objects.to_a.empty? .results.gl-md-display-flex.gl-mt-3 - - if %w(issues merge_requests).include?(@scope) + - if %w[issues merge_requests].include?(@scope) #js-search-sidebar{ class: search_bar_classes } .gl-w-full.gl-flex-grow-1.gl-overflow-x-hidden - if @timeout diff --git a/ee/app/views/layouts/nav/ee/admin/_geo_sidebar.html.haml b/ee/app/views/layouts/nav/ee/admin/_geo_sidebar.html.haml index 1ec218e51d8e83..26713af944c2f8 100644 --- a/ee/app/views/layouts/nav/ee/admin/_geo_sidebar.html.haml +++ b/ee/app/views/layouts/nav/ee/admin/_geo_sidebar.html.haml @@ -1,4 +1,4 @@ -= nav_link(controller: %w(admin/geo/nodes admin/geo/projects admin/geo/uploads admin/geo/settings admin/geo/designs admin/geo/replicables)) do += nav_link(controller: %w[admin/geo/nodes admin/geo/projects admin/geo/uploads admin/geo/settings admin/geo/designs admin/geo/replicables]) do = link_to admin_geo_nodes_path, class: "qa-link-geo-menu has-sub-items" do .nav-icon-container = sprite_icon('location-dot') @@ -14,7 +14,7 @@ = link_to admin_geo_nodes_path, title: _('Sites') do %span = _('Sites') - = nav_link(controller: %w(admin/geo/projects admin/geo/uploads admin/geo/designs admin/geo/replicables)) do + = nav_link(controller: %w[admin/geo/projects admin/geo/uploads admin/geo/designs admin/geo/replicables]) do = link_to admin_geo_projects_path, title: _('Replication') do %span = _('Replication') diff --git a/ee/app/views/shared/integrations/gitlab_slack_application/_slack_integration_form.html.haml b/ee/app/views/shared/integrations/gitlab_slack_application/_slack_integration_form.html.haml index 00a62f6ac8e2f3..53505f57ef894a 100644 --- a/ee/app/views/shared/integrations/gitlab_slack_application/_slack_integration_form.html.haml +++ b/ee/app/views/shared/integrations/gitlab_slack_application/_slack_integration_form.html.haml @@ -27,6 +27,6 @@ .gl-my-5 = render 'shared/integrations/gitlab_slack_application/slack_button', project: @project, label: s_('SlackIntegration|Reinstall Slack app') %p - = html_escape(s_('SlackIntegration|You may need to reinstall the Slack application when we %{linkStart}make updates or change permissions%{linkEnd}.')) % { linkStart: %Q{}.html_safe, linkEnd: ''.html_safe} + = html_escape(s_('SlackIntegration|You may need to reinstall the Slack application when we %{linkStart}make updates or change permissions%{linkEnd}.')) % { linkStart: %Q().html_safe, linkEnd: ''.html_safe} - else = render 'shared/integrations/gitlab_slack_application/slack_button', project: @project, label: s_('SlackIntegration|Install Slack app') -- GitLab