diff --git a/.rubocop_todo/layout/space_inside_block_braces.yml b/.rubocop_todo/layout/space_inside_block_braces.yml index 38ee4c862cafea3378624c4ac442f2f3e87e4fef..d8454708d821ad98c1e49bb977e7e9a1e3b3b26e 100644 --- a/.rubocop_todo/layout/space_inside_block_braces.yml +++ b/.rubocop_todo/layout/space_inside_block_braces.yml @@ -1,10 +1,6 @@ --- # Cop supports --auto-correct. Layout/SpaceInsideBlockBraces: - # Offense count: 1508 - # Temporarily disabled due to too many offenses - Enabled: false - EnforcedStyle: space Exclude: - 'app/controllers/groups/boards_controller.rb' - 'app/controllers/profiles/two_factor_auths_controller.rb' @@ -16,8 +12,6 @@ Layout/SpaceInsideBlockBraces: - 'app/helpers/todos_helper.rb' - 'app/models/authentication_event.rb' - 'app/models/bulk_imports/entity.rb' - - 'app/models/ci/pipeline.rb' - - 'app/models/concerns/cache_markdown_field.rb' - 'app/models/concerns/featurable.rb' - 'app/models/integrations/bamboo.rb' - 'app/models/integrations/buildkite.rb' @@ -41,7 +35,9 @@ Layout/SpaceInsideBlockBraces: - 'ee/app/models/compliance_management/framework.rb' - 'ee/app/models/dora/daily_metrics.rb' - 'ee/app/models/ee/application_setting.rb' + - 'ee/app/models/ee/deployment.rb' - 'ee/app/models/ee/member.rb' + - 'ee/app/models/vulnerabilities/feedback.rb' - 'ee/app/models/vulnerabilities/identifier.rb' - 'ee/app/serializers/vulnerabilities/finding_entity.rb' - 'ee/app/services/elastic/cluster_reindexing_service.rb' @@ -51,6 +47,7 @@ Layout/SpaceInsideBlockBraces: - 'ee/lib/elastic/latest/git_class_proxy.rb' - 'ee/lib/gitlab/auth/smartcard/san_extension.rb' - 'ee/lib/world.rb' + - 'ee/spec/features/admin/admin_runners_spec.rb' - 'lib/api/commits.rb' - 'lib/api/helpers/merge_requests_helpers.rb' - 'lib/backup/manager.rb' @@ -60,8 +57,10 @@ Layout/SpaceInsideBlockBraces: - 'lib/bitbucket_server/representation/base.rb' - 'lib/gitlab/background_migration/fix_projects_without_prometheus_service.rb' - 'lib/gitlab/contributions_calendar.rb' - - 'lib/gitlab/database/migrations/test_background_runner.rb' + - 'lib/gitlab/database/migrations/base_background_runner.rb' - 'lib/gitlab/database/postgres_hll/buckets.rb' + - 'lib/gitlab/diff/rendered/notebook/diff_file.rb' + - 'lib/gitlab/diff/rendered/notebook/diff_file_helper.rb' - 'lib/gitlab/email/message/in_product_marketing/helper.rb' - 'lib/gitlab/issues/rebalancing/state.rb' - 'lib/gitlab/profiler.rb' @@ -74,12 +73,14 @@ Layout/SpaceInsideBlockBraces: - 'lib/tasks/gitlab/shell.rake' - 'lib/tasks/gitlab/tw/codeowners.rake' - 'rubocop/cop/migration/add_limit_to_text_columns.rb' + - 'scripts/qa/testcases-check' + - 'spec/channels/awareness_channel_spec.rb' + - 'spec/components/pajamas/banner_component_spec.rb' - 'spec/config/settings_spec.rb' - 'spec/controllers/admin/application_settings_controller_spec.rb' - 'spec/controllers/application_controller_spec.rb' - 'spec/controllers/groups/labels_controller_spec.rb' - 'spec/controllers/groups/releases_controller_spec.rb' - - 'spec/controllers/groups/settings/ci_cd_controller_spec.rb' - 'spec/controllers/import/manifest_controller_spec.rb' - 'spec/controllers/projects/blame_controller_spec.rb' - 'spec/controllers/projects/deploy_keys_controller_spec.rb' @@ -122,6 +123,7 @@ Layout/SpaceInsideBlockBraces: - 'spec/frontend/fixtures/clusters.rb' - 'spec/frontend/fixtures/deploy_keys.rb' - 'spec/frontend/fixtures/groups.rb' + - 'spec/frontend/fixtures/integrations.rb' - 'spec/frontend/fixtures/issues.rb' - 'spec/frontend/fixtures/jobs.rb' - 'spec/frontend/fixtures/labels.rb' @@ -131,6 +133,7 @@ Layout/SpaceInsideBlockBraces: - 'spec/frontend/fixtures/pipeline_schedules.rb' - 'spec/frontend/fixtures/pipelines.rb' - 'spec/frontend/fixtures/projects.rb' + - 'spec/frontend/fixtures/prometheus_integration.rb' - 'spec/frontend/fixtures/raw.rb' - 'spec/frontend/fixtures/snippet.rb' - 'spec/frontend/fixtures/todos.rb' @@ -144,30 +147,41 @@ Layout/SpaceInsideBlockBraces: - 'spec/helpers/wiki_page_version_helper_spec.rb' - 'spec/initializers/carrierwave_patch_spec.rb' - 'spec/initializers/trusted_proxies_spec.rb' + - 'spec/lib/gitlab/ci/parsers/security/validators/schema_validator_spec.rb' + - 'spec/lib/gitlab/memory/reports/jemalloc_stats_spec.rb' - 'spec/mailers/emails/service_desk_spec.rb' - 'spec/migrations/20210812013042_remove_duplicate_project_authorizations_spec.rb' - 'spec/migrations/20210910194952_update_report_type_for_existing_approval_project_rules_spec.rb' + - 'spec/migrations/20220505174658_update_index_on_alerts_to_exclude_null_fingerprints_spec.rb' - 'spec/migrations/confirm_support_bot_user_spec.rb' - 'spec/migrations/reset_job_token_scope_enabled_again_spec.rb' - 'spec/migrations/reset_job_token_scope_enabled_spec.rb' - 'spec/migrations/reset_severity_levels_to_new_default_spec.rb' - - 'spec/migrations/schedule_copy_ci_builds_columns_to_security_scans2_spec.rb' + - 'spec/models/merge_request/approval_removal_settings_spec.rb' - 'spec/policies/clusters/agent_policy_spec.rb' - 'spec/policies/group_member_policy_spec.rb' - 'spec/policies/issue_policy_spec.rb' - 'spec/policies/project_policy_spec.rb' - 'spec/policies/terraform/state_policy_spec.rb' - 'spec/policies/terraform/state_version_policy_spec.rb' + - 'spec/policies/timelog_policy_spec.rb' - 'spec/presenters/packages/composer/packages_presenter_spec.rb' - 'spec/presenters/packages/conan/package_presenter_spec.rb' - 'spec/presenters/packages/nuget/packages_metadata_presenter_spec.rb' + - 'spec/presenters/packages/pypi/simple_package_versions_presenter_spec.rb' - 'spec/presenters/project_presenter_spec.rb' - 'spec/rubocop/cop/migration/create_table_with_foreign_keys_spec.rb' + - 'spec/scripts/changed-feature-flags_spec.rb' - 'spec/serializers/cluster_entity_spec.rb' + - 'spec/serializers/deploy_keys/basic_deploy_key_entity_spec.rb' + - 'spec/serializers/deploy_keys/deploy_key_entity_spec.rb' - 'spec/serializers/import/provider_repo_serializer_spec.rb' + - 'spec/services/ci/runners/bulk_delete_runners_service_spec.rb' + - 'spec/services/work_items/widgets/assignees_service/update_service_spec.rb' + - 'spec/services/work_items/widgets/start_and_due_date_service/update_service_spec.rb' - 'spec/support/helpers/cycle_analytics_helpers.rb' + - 'spec/support/helpers/graphql_helpers.rb' - 'spec/support/redis/redis_shared_examples.rb' - - 'spec/support/shared_contexts/features/integrations/integrations_shared_context.rb' - 'spec/support/shared_contexts/graphql/requests/packages_shared_context.rb' - 'spec/support/shared_contexts/markdown_golden_master_shared_examples.rb' - 'spec/support/shared_contexts/requests/api/conan_packages_shared_context.rb' @@ -176,6 +190,7 @@ Layout/SpaceInsideBlockBraces: - 'spec/support/shared_examples/features/board_sidebar_labels_examples.rb' - 'spec/support/shared_examples/features/snippets_shared_examples.rb' - 'spec/support/shared_examples/features/wiki/user_views_asciidoc_page_with_includes_shared_examples.rb' + - 'spec/support/shared_examples/helpers/wiki_helpers_shared_examples.rb' - 'spec/support/shared_examples/lib/gitlab/ci/ci_trace_shared_examples.rb' - 'spec/support/shared_examples/lib/gitlab/sql/set_operator_shared_examples.rb' - 'spec/support/shared_examples/models/cluster_application_core_shared_examples.rb' @@ -185,7 +200,6 @@ Layout/SpaceInsideBlockBraces: - 'spec/support/shared_examples/models/label_note_shared_examples.rb' - 'spec/support/shared_examples/models/packages/debian/distribution_shared_examples.rb' - 'spec/support/shared_examples/models/project_latest_successful_build_for_shared_examples.rb' - - 'spec/support/shared_examples/requests/api/graphql/group_and_project_boards_query_shared_examples.rb' - 'spec/support/shared_examples/requests/api/issues/merge_requests_count_shared_examples.rb' - 'spec/support/shared_examples/requests/api/labels_api_shared_examples.rb' - 'spec/support/shared_examples/requests/api/repository_storage_moves_shared_examples.rb' @@ -198,12 +212,14 @@ Layout/SpaceInsideBlockBraces: - 'spec/tasks/gitlab/snippets_rake_spec.rb' - 'spec/uploaders/packages/debian/distribution_release_file_uploader_spec.rb' - 'spec/validators/addressable_url_validator_spec.rb' + - 'spec/views/devise/sessions/new.html.haml_spec.rb' - 'spec/views/help/instance_configuration.html.haml_spec.rb' - 'spec/views/layouts/_header_search.html.haml_spec.rb' - 'spec/views/layouts/_published_experiments.html.haml_spec.rb' - 'spec/views/shared/runners/_runner_details.html.haml_spec.rb' - 'spec/workers/bulk_imports/export_request_worker_spec.rb' - 'spec/workers/clusters/cleanup/project_namespace_worker_spec.rb' + - 'spec/workers/packages/cleanup/execute_policy_worker_spec.rb' - 'spec/workers/packages/helm/extraction_worker_spec.rb' - 'spec/workers/pages_worker_spec.rb' - 'spec/workers/purge_dependency_proxy_cache_worker_spec.rb' diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml index a63e02fca1d3f02cd02f2bf60ba12738bafbf511..f8737a4e54a2d1138c6e53d34ac54dac9efb8d0a 100644 --- a/app/views/profiles/preferences/show.html.haml +++ b/app/views/profiles/preferences/show.html.haml @@ -99,7 +99,7 @@ s_("Preferences|Show one file at a time on merge request's Changes tab"), help_text: s_("Preferences|Instead of all the files changed, show only one file at a time. To switch between files, use the file browser.") .form-group - - supported_characters = %w(" ' ` ( [ { < * _).map {|char| "#{char}" }.join(', ') + - supported_characters = %w(" ' ` ( [ { < * _).map { |char| "#{char}" }.join(', ') = f.gitlab_ui_checkbox_component :markdown_surround_selection, s_('Preferences|Surround text selection when typing quotes or brackets'), help_text: sprintf(s_( "Preferences|When you type in a description or comment box, selected text is surrounded by the corresponding character after typing one of the following characters: %{supported_characters}."), { supported_characters: supported_characters }).html_safe