diff --git a/.rubocop_todo/style/symbol_proc.yml b/.rubocop_todo/style/symbol_proc.yml index ea3a505d2da781d1215bb5ac74a64baaf2850d7c..770b99109b429816f8632e3d70105d8f083be1d8 100644 --- a/.rubocop_todo/style/symbol_proc.yml +++ b/.rubocop_todo/style/symbol_proc.yml @@ -1,9 +1,6 @@ --- # Cop supports --auto-correct. Style/SymbolProc: - # Offense count: 341 - # Temporarily disabled due to too many offenses - Enabled: false Exclude: - 'app/controllers/admin/users_controller.rb' - 'app/controllers/concerns/renders_blob.rb' @@ -14,7 +11,10 @@ Style/SymbolProc: - 'app/controllers/profiles_controller.rb' - 'app/finders/packages/go/version_finder.rb' - 'app/graphql/mutations/commits/create.rb' + - 'app/graphql/mutations/concerns/mutations/work_items/widgetable.rb' - 'app/graphql/mutations/jira_import/start.rb' + - 'app/graphql/mutations/work_items/update_widgets.rb' + - 'app/graphql/types/work_items/widgets/description_type.rb' - 'app/helpers/graph_helper.rb' - 'app/models/ci/build_metadata.rb' - 'app/models/ci/build_trace_chunk.rb' @@ -24,6 +24,7 @@ Style/SymbolProc: - 'app/models/concerns/board_recent_visit.rb' - 'app/models/concerns/resolvable_discussion.rb' - 'app/models/container_repository.rb' + - 'app/models/deployment.rb' - 'app/models/discussion.rb' - 'app/models/environment.rb' - 'app/models/integrations/prometheus.rb' @@ -43,11 +44,9 @@ Style/SymbolProc: - 'app/serializers/build_details_entity.rb' - 'app/serializers/ci/pipeline_entity.rb' - 'app/serializers/ci/trigger_entity.rb' - - 'app/serializers/cluster_entity.rb' - 'app/serializers/deployment_cluster_entity.rb' - 'app/serializers/deployment_entity.rb' - 'app/serializers/draft_note_entity.rb' - - 'app/serializers/environment_entity.rb' - 'app/serializers/import/bitbucket_provider_repo_entity.rb' - 'app/serializers/import/fogbugz_provider_repo_entity.rb' - 'app/serializers/issuable_sidebar_basic_entity.rb' @@ -55,6 +54,7 @@ Style/SymbolProc: - 'app/serializers/linked_project_issue_entity.rb' - 'app/serializers/member_entity.rb' - 'app/serializers/member_user_entity.rb' + - 'app/serializers/merge_request_poll_widget_entity.rb' - 'app/serializers/merge_request_widget_entity.rb' - 'app/serializers/project_entity.rb' - 'app/serializers/project_mirror_entity.rb' @@ -69,7 +69,6 @@ Style/SymbolProc: - 'app/services/ci/update_build_state_service.rb' - 'app/services/clusters/agents/delete_expired_events_service.rb' - 'app/services/feature_flags/update_service.rb' - - 'app/services/google_cloud/enable_cloud_run_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' @@ -81,6 +80,7 @@ Style/SymbolProc: - 'app/workers/bulk_imports/stuck_import_worker.rb' - 'app/workers/ci/build_trace_chunk_flush_worker.rb' - 'app/workers/gitlab/import/stuck_import_job.rb' + - 'app/workers/merge_requests/update_head_pipeline_worker.rb' - 'app/workers/namespaces/prune_aggregation_schedules_worker.rb' - 'app/workers/stuck_export_jobs_worker.rb' - 'app/workers/update_head_pipeline_for_merge_request_worker.rb' @@ -119,6 +119,7 @@ Style/SymbolProc: - 'ee/lib/ee/api/entities/geo_node.rb' - 'ee/lib/ee/api/entities/merge_request_approval_state.rb' - 'ee/lib/ee/gitlab/auth/ldap/access.rb' + - 'ee/lib/ee/gitlab/background_migration/backfill_project_statistics_container_repository_size.rb' - 'ee/lib/ee/gitlab/background_migration/drop_invalid_remediations.rb' - 'ee/lib/ee/gitlab/background_migration/fix_incorrect_max_seats_used.rb' - 'ee/lib/ee/gitlab/background_migration/populate_uuids_for_security_findings.rb' @@ -126,6 +127,7 @@ Style/SymbolProc: - 'ee/lib/gitlab/contribution_analytics/data_collector.rb' - 'ee/lib/gitlab/custom_file_templates.rb' - 'ee/lib/gitlab/geo/oauth/logout_state.rb' + - 'ee/spec/elastic/migrate/20220118150500_delete_orphaned_commits_spec.rb' - 'ee/spec/factories/issues.rb' - 'ee/spec/features/billings/extend_reactivate_trial_spec.rb' - 'ee/spec/features/billings/qrtly_reconciliation_alert_spec.rb' @@ -133,13 +135,12 @@ 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/lib/gitlab/graphql/aggregations/issues/lazy_links_aggregate_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' - 'lib/api/api_guard.rb' - 'lib/api/entities/board.rb' - - 'lib/api/entities/environment.rb' - 'lib/api/entities/issuable_references.rb' - 'lib/api/entities/merge_request_approvals.rb' - 'lib/api/entities/package.rb' @@ -148,7 +149,6 @@ Style/SymbolProc: - 'lib/api/go_proxy.rb' - 'lib/api/helpers/internal_helpers.rb' - 'lib/api/package_files.rb' - - 'lib/api/terraform/state.rb' - 'lib/atlassian/jira_connect/serializers/base_entity.rb' - 'lib/banzai/filter/inline_cluster_metrics_filter.rb' - 'lib/banzai/filter/inline_embeds_filter.rb' @@ -157,6 +157,7 @@ Style/SymbolProc: - 'lib/container_registry/client.rb' - 'lib/container_registry/gitlab_api_client.rb' - 'lib/gitlab/analytics/cycle_analytics/stage_events.rb' + - 'lib/gitlab/auth/o_auth/auth_hash.rb' - 'lib/gitlab/background_migration/cleanup_orphaned_lfs_objects_projects.rb' - 'lib/gitlab/background_migration/recalculate_vulnerabilities_occurrences_uuid.rb' - 'lib/gitlab/background_migration/remove_occurrence_pipelines_and_duplicate_vulnerabilities_findings.rb' @@ -164,7 +165,6 @@ Style/SymbolProc: - 'lib/gitlab/cache/ci/project_pipeline_status.rb' - 'lib/gitlab/checks/changes_access.rb' - 'lib/gitlab/ci/pipeline/preloader.rb' - - 'lib/gitlab/ci/runner_upgrade_check.rb' - 'lib/gitlab/ci/trace.rb' - 'lib/gitlab/config/entry/node.rb' - 'lib/gitlab/database/async_indexes/migration_helpers.rb' @@ -172,6 +172,7 @@ Style/SymbolProc: - 'lib/gitlab/database/migrations/background_migration_helpers.rb' - 'lib/gitlab/database/migrations/instrumentation.rb' - 'lib/gitlab/diff/file_collection/base.rb' + - 'lib/gitlab/diff/rendered/notebook/diff_file_helper.rb' - 'lib/gitlab/git/diff_stats_collection.rb' - 'lib/gitlab/gitaly_client/commit_service.rb' - 'lib/gitlab/gitaly_client/wiki_service.rb' @@ -199,9 +200,9 @@ Style/SymbolProc: - 'qa/qa/resource/project_snippet.rb' - 'qa/qa/runtime/ip_address.rb' - 'qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb' - - 'qa/qa/specs/features/browser_ui/3_create/jenkins/jenkins_build_status_spec.rb' - 'qa/qa/specs/features/browser_ui/3_create/merge_request/rebase_merge_request_spec.rb' - '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' @@ -219,6 +220,7 @@ Style/SymbolProc: - 'spec/controllers/concerns/product_analytics_tracking_spec.rb' - 'spec/controllers/concerns/redis_tracking_spec.rb' - 'spec/controllers/projects/merge_requests/conflicts_controller_spec.rb' + - 'spec/factories/application_settings.rb' - 'spec/factories/ci/builds.rb' - 'spec/factories/clusters/providers/aws.rb' - 'spec/factories/oauth_openid_requests.rb' @@ -234,16 +236,19 @@ Style/SymbolProc: - 'spec/finders/license_template_finder_spec.rb' - 'spec/finders/packages/go/version_finder_spec.rb' - 'spec/graphql/mutations/releases/create_spec.rb' + - 'spec/graphql/types/work_items/widget_type_enum_spec.rb' - 'spec/helpers/instance_configuration_helper_spec.rb' - 'spec/helpers/learn_gitlab_helper_spec.rb' - 'spec/helpers/members_helper_spec.rb' - 'spec/lib/backup/gitaly_backup_spec.rb' - 'spec/lib/gitlab/database/dynamic_model_helpers_spec.rb' + - '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' - 'spec/lib/gitlab/instrumentation/redis_spec.rb' - 'spec/lib/gitlab/optimistic_locking_spec.rb' - 'spec/lib/gitlab/pagination/keyset/in_operator_optimization/query_builder_spec.rb' @@ -252,12 +257,14 @@ Style/SymbolProc: - 'spec/lib/gitlab/usage/metrics/instrumentations/database_metric_spec.rb' - 'spec/lib/omni_auth/strategies/jwt_spec.rb' - 'spec/models/member_spec.rb' + - 'spec/models/merge_request_diff_spec.rb' - 'spec/models/namespace/root_storage_statistics_spec.rb' - 'spec/models/operations/feature_flags/strategy_spec.rb' - 'spec/models/project_statistics_spec.rb' - 'spec/models/repository_spec.rb' - 'spec/models/user_spec.rb' - 'spec/presenters/projects/import_export/project_export_presenter_spec.rb' + - 'spec/requests/api/internal/mail_room_spec.rb' - 'spec/requests/api/snippet_repository_storage_moves_spec.rb' - 'spec/requests/api/tags_spec.rb' - 'spec/services/ci/pipelines/add_job_service_spec.rb' @@ -266,12 +273,14 @@ Style/SymbolProc: - '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' - 'spec/support/helpers/migrations_helpers.rb' - 'spec/support/shared_contexts/finders/users_finder_shared_contexts.rb' - 'spec/support/shared_examples/lib/gitlab/ci/ci_trace_shared_examples.rb' - 'spec/support/shared_examples/lib/gitlab/import_export/attributes_permitter_shared_examples.rb' + - 'spec/support/shared_examples/lib/gitlab/search_language_filter_shared_examples.rb' - 'spec/support/shared_examples/models/label_note_shared_examples.rb' - 'spec/views/layouts/_published_experiments.html.haml_spec.rb' - 'spec/workers/snippets/schedule_bulk_repository_shard_moves_worker_spec.rb' diff --git a/app/views/projects/diffs/_diffs.html.haml b/app/views/projects/diffs/_diffs.html.haml index d596199f8166cb4dfcb3d500f8f85cb8629666cc..11984a9d6f6d6a0ca7cc114a8fa9492947a6e444 100644 --- a/app/views/projects/diffs/_diffs.html.haml +++ b/app/views/projects/diffs/_diffs.html.haml @@ -11,7 +11,7 @@ .content-block.oneline-block.files-changed.diff-files-changed.js-diff-files-changed .files-changed-inner .inline-parallel-buttons.gl-display-none.gl-md-display-flex - - if !diffs_expanded? && diff_files.any? { |diff_file| diff_file.collapsed? } + - if !diffs_expanded? && diff_files.any?(&:collapsed?) = link_to _('Expand all'), url_for(safe_params.merge(expanded: 1, format: nil)), class: 'gl-button btn btn-default' - if show_whitespace_toggle - if current_controller?(:commit)