From 52ee754a24ec5558c3e26c7cbef41d471311a8a8 Mon Sep 17 00:00:00 2001 From: Siddharth Asthana Date: Fri, 5 Aug 2022 18:16:42 +0530 Subject: [PATCH 1/2] RuboCop: Enable previously disabled Style/StringConcatenation Changelog: other --- .rubocop_todo/style/string_concatenation.yml | 21 +++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/.rubocop_todo/style/string_concatenation.yml b/.rubocop_todo/style/string_concatenation.yml index 8c8dbf86b1c944..2330683cc18459 100644 --- a/.rubocop_todo/style/string_concatenation.yml +++ b/.rubocop_todo/style/string_concatenation.yml @@ -1,10 +1,8 @@ --- # Cop supports --auto-correct. Style/StringConcatenation: - # Offense count: 611 - # Temporarily disabled due to too many offenses - Enabled: false Exclude: + - 'app/components/pajamas/button_component.rb' - 'app/controllers/concerns/creates_commit.rb' - 'app/controllers/groups/dependency_proxy_for_containers_controller.rb' - 'app/controllers/jira_connect/app_descriptor_controller.rb' @@ -45,7 +43,6 @@ Style/StringConcatenation: - 'app/services/packages/debian/generate_distribution_key_service.rb' - 'app/services/packages/debian/generate_distribution_service.rb' - 'app/services/pages/zip_directory_service.rb' - - 'app/services/projects/update_pages_service.rb' - 'app/services/repositories/base_service.rb' - 'app/services/verify_pages_domain_service.rb' - 'app/uploaders/gitlab_uploader.rb' @@ -56,6 +53,7 @@ Style/StringConcatenation: - 'db/migrate/20210412111213_create_security_orchestration_policy_rule_schedule.rb' - 'ee/app/controllers/admin/elasticsearch_controller.rb' - 'ee/app/finders/ee/issuables/label_filter.rb' + - 'ee/app/helpers/ee/geo_helper.rb' - 'ee/app/helpers/ee/gitlab_routing_helper.rb' - 'ee/app/helpers/ee/mirror_helper.rb' - 'ee/app/helpers/ee/search_helper.rb' @@ -70,6 +68,7 @@ Style/StringConcatenation: - 'ee/lib/api/project_mirror.rb' - 'ee/lib/ee/audit/project_changes_auditor.rb' - 'ee/lib/ee/gitlab/auth/ldap/person.rb' + - 'ee/lib/ee/gitlab/background_migration/backfill_project_statistics_container_repository_size.rb' - 'ee/lib/ee/gitlab/background_migration/populate_latest_pipeline_ids.rb' - 'ee/lib/ee/gitlab/background_migration/populate_resolved_on_default_branch_column.rb' - 'ee/lib/elastic/latest/git_class_proxy.rb' @@ -81,7 +80,6 @@ Style/StringConcatenation: - 'ee/spec/controllers/trial_registrations_controller_spec.rb' - 'ee/spec/features/boards/boards_spec.rb' - 'ee/spec/features/projects/pipelines/pipeline_spec.rb' - - 'ee/spec/helpers/ee/integrations_helper_spec.rb' - 'ee/spec/helpers/search_helper_spec.rb' - 'ee/spec/lib/gitlab/auth/ldap/person_spec.rb' - 'ee/spec/lib/gitlab/auth/o_auth/user_spec.rb' @@ -94,8 +92,8 @@ Style/StringConcatenation: - 'ee/spec/models/dast_site_validation_spec.rb' - 'ee/spec/models/ee/audit_event_spec.rb' - 'ee/spec/models/geo_node_spec.rb' + - 'ee/spec/models/incident_management/issuable_resource_link_spec.rb' - 'ee/spec/models/status_page/project_setting_spec.rb' - - 'ee/spec/requests/api/internal/kubernetes_spec.rb' - 'ee/spec/services/jira/jql_builder_service_spec.rb' - 'ee/spec/services/projects/hashed_storage/migrate_repository_service_spec.rb' - 'ee/spec/services/todo_service_spec.rb' @@ -138,6 +136,7 @@ Style/StringConcatenation: - 'lib/gitlab/kubernetes/kubectl_cmd.rb' - 'lib/gitlab/lfs/client.rb' - 'lib/gitlab/logger.rb' + - 'lib/gitlab/pages/deployment_update.rb' - 'lib/gitlab/path_regex.rb' - 'lib/gitlab/prometheus/internal.rb' - 'lib/gitlab/quick_actions/extractor.rb' @@ -150,6 +149,7 @@ Style/StringConcatenation: - 'lib/gitlab/throttle.rb' - 'lib/gitlab/time_tracking_formatter.rb' - 'lib/gitlab/untrusted_regexp.rb' + - 'lib/gitlab/usage/metrics/instrumentations/issues_created_from_alerts_metric.rb' - 'lib/gitlab/usage_data_counters/quick_action_activity_unique_counter.rb' - 'lib/gitlab/usage_data_queries.rb' - 'lib/google_api/cloud_platform/client.rb' @@ -163,8 +163,8 @@ Style/StringConcatenation: - 'qa/qa/page/milestone/new.rb' - 'qa/qa/page/project/milestone/new.rb' - 'qa/qa/page/project/settings/deploy_tokens.rb' + - 'qa/qa/specs/features/browser_ui/3_create/source_editor/source_editor_toolbar_spec.rb' - 'qa/qa/specs/features/ee/browser_ui/3_create/repository/assign_code_owners_spec.rb' - - 'qa/qa/support/page_error_checker.rb' - 'qa/qa/tools/generate_perf_testdata.rb' - 'scripts/perf/gc/print_gc_stats.rb' - 'scripts/perf/query_limiting_report.rb' @@ -230,7 +230,6 @@ Style/StringConcatenation: - 'spec/lib/gitlab/gitaly_client/repository_service_spec.rb' - 'spec/lib/gitlab/gitaly_client/wiki_service_spec.rb' - 'spec/lib/gitlab/import_export/snippet_repo_restorer_spec.rb' - - 'spec/lib/gitlab/kubernetes/kube_client_spec.rb' - 'spec/lib/gitlab/lfs/client_spec.rb' - 'spec/lib/gitlab/other_markup_spec.rb' - 'spec/lib/gitlab/path_regex_spec.rb' @@ -246,6 +245,7 @@ Style/StringConcatenation: - 'spec/lib/gitlab/tree_summary_spec.rb' - 'spec/lib/gitlab/url_blocker_spec.rb' - 'spec/lib/gitlab/utils_spec.rb' + - 'spec/lib/gitlab/visibility_level_spec.rb' - 'spec/lib/gitlab/wiki_pages/front_matter_parser_spec.rb' - 'spec/lib/gitlab/workhorse_spec.rb' - 'spec/lib/kramdown/kramdown_spec.rb' @@ -288,12 +288,14 @@ Style/StringConcatenation: - 'spec/requests/api/merge_requests_spec.rb' - 'spec/requests/api/notes_spec.rb' - 'spec/requests/api/pypi_packages_spec.rb' + - 'spec/requests/users_controller_spec.rb' - 'spec/routing/git_http_routing_spec.rb' - 'spec/services/ci/find_exposed_artifacts_service_spec.rb' - 'spec/services/clusters/gcp/finalize_creation_service_spec.rb' - 'spec/services/clusters/kubernetes/configure_istio_ingress_service_spec.rb' - 'spec/services/clusters/kubernetes/create_or_update_service_account_service_spec.rb' - 'spec/services/error_tracking/list_projects_service_spec.rb' + - 'spec/services/groups/update_service_spec.rb' - 'spec/services/merge_requests/build_service_spec.rb' - 'spec/services/metrics/dashboard/grafana_metric_embed_service_spec.rb' - 'spec/services/packages/conan/create_package_file_service_spec.rb' @@ -303,6 +305,7 @@ Style/StringConcatenation: - 'spec/services/projects/create_service_spec.rb' - 'spec/services/projects/destroy_service_spec.rb' - 'spec/services/projects/download_service_spec.rb' + - 'spec/services/projects/update_service_spec.rb' - 'spec/services/push_event_payload_service_spec.rb' - 'spec/services/repositories/destroy_service_spec.rb' - 'spec/services/snippets/bulk_destroy_service_spec.rb' @@ -323,9 +326,9 @@ Style/StringConcatenation: - 'spec/support/shared_examples/lib/banzai/reference_parser_shared_examples.rb' - 'spec/support/shared_examples/models/packages/debian/distribution_shared_examples.rb' - 'spec/support/shared_examples/models/wiki_shared_examples.rb' + - 'spec/support/shared_examples/requests/api/hooks_shared_examples.rb' - 'spec/support/shared_examples/requests/snippet_shared_examples.rb' - 'spec/support/unpack-gitlab-git-test' - - 'spec/tasks/gitlab/backup_rake_spec.rb' - 'spec/tooling/lib/tooling/kubernetes_client_spec.rb' - 'spec/uploaders/job_artifact_uploader_spec.rb' - 'spec/validators/addressable_url_validator_spec.rb' -- GitLab From d34142581f8ca6f650ebf73e8fe9b2f9688ef29a Mon Sep 17 00:00:00 2001 From: Peter Leitzen Date: Wed, 10 Aug 2022 12:21:04 +0200 Subject: [PATCH 2/2] Disable RuboCop Style/StringConcatenation for HAML lint It's too much noise for now. Currently, haml lint does not support excluding HAML files per RuboCop cop. Add them to .rubocop_todo does also not work. --- .haml-lint.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.haml-lint.yml b/.haml-lint.yml index 1345df2c0bd01c..7db3d64409b530 100644 --- a/.haml-lint.yml +++ b/.haml-lint.yml @@ -134,6 +134,7 @@ linters: - Style/NegatedIf - Style/NestedTernaryOperator - Style/SelfAssignment + - Style/StringConcatenation - Style/TernaryParentheses - Style/TrailingCommaInHashLiteral - Style/UnlessElse -- GitLab