diff --git a/.rubocop_todo/layout/hash_alignment.yml b/.rubocop_todo/layout/hash_alignment.yml index 076b3adf7f5a2398dd4c8d7f213e532a1ec7d250..8f49e7f5c2ba90cc15eb4d60c000198d9faa491e 100644 --- a/.rubocop_todo/layout/hash_alignment.yml +++ b/.rubocop_todo/layout/hash_alignment.yml @@ -1,70 +1,164 @@ --- +# Cop supports --auto-correct. Layout/HashAlignment: - # Offense count: 630 - # Temporarily disabled due to too many offenses - Enabled: false Exclude: - - 'app/models/bulk_imports/configuration.rb' - - 'app/models/ci/bridge.rb' - - 'app/models/ci/build_trace_metadata.rb' - - 'app/models/ci/pipeline.rb' - - 'app/models/compare.rb' - - 'app/models/concerns/ci/has_status.rb' - - 'app/models/concerns/enums/data_visualization_palette.rb' - - 'app/models/concerns/featurable.rb' - - 'app/models/concerns/issuable.rb' - - 'app/models/concerns/triggerable_hooks.rb' - - 'app/models/container_repository.rb' - - 'app/models/design_management/design.rb' - - 'app/models/design_management/design_action.rb' - - 'app/models/event.rb' - - 'app/models/grafana_integration.rb' - - 'app/models/group.rb' - - 'app/models/hooks/web_hook.rb' - - 'app/models/integrations/emails_on_push.rb' - - 'app/models/integrations/jira.rb' - - 'app/models/issuable_severity.rb' - - 'app/models/jira_connect_installation.rb' - - 'app/models/loose_foreign_keys/deleted_record.rb' - - 'app/models/merge_request.rb' - - 'app/models/merge_request_diff.rb' - - 'app/models/pages_domain.rb' - - 'app/models/project.rb' - - 'app/models/prometheus_alert.rb' - - 'app/models/serverless/domain_cluster.rb' - - 'app/models/snippet.rb' - - 'app/models/terraform/state.rb' - - 'app/models/user.rb' - - 'app/models/user_status.rb' - - 'app/models/wiki.rb' - - 'app/models/work_items/type.rb' + - 'app/finders/releases/group_releases_finder.rb' + - 'app/graphql/mutations/award_emojis/toggle.rb' + - 'app/graphql/mutations/design_management/move.rb' + - 'app/graphql/mutations/issues/set_severity.rb' + - 'app/graphql/mutations/security/ci_configuration/base_security_analyzer.rb' + - 'app/graphql/types/alert_management/domain_filter_enum.rb' + - 'app/graphql/types/ci/group_variable_type.rb' + - 'app/graphql/types/ci/instance_variable_type.rb' + - 'app/graphql/types/ci/manual_variable_type.rb' + - 'app/graphql/types/ci/project_variable_type.rb' + - 'app/graphql/types/ci/variable_interface.rb' + - 'app/graphql/types/packages/package_base_type.rb' + - 'app/graphql/types/permission_types/group_enum.rb' + - 'app/graphql/types/upload_type.rb' + - 'app/graphql/types/work_items/widget_interface.rb' + - 'app/graphql/types/work_items/widgets/assignees_type.rb' + - 'app/graphql/types/work_items/widgets/description_type.rb' + - 'app/graphql/types/work_items/widgets/hierarchy_type.rb' + - 'app/graphql/types/work_items/widgets/labels_type.rb' + - 'app/graphql/types/work_items/widgets/start_and_due_date_type.rb' + - 'app/models/issue.rb' + - 'app/models/work_item.rb' + - 'app/services/issuable/import_csv/base_service.rb' + - 'app/services/projects/import_export/export_service.rb' + - 'config/routes.rb' + - 'db/migrate/20220406113217_add_inactive_project_deletion_to_application_settings.rb' + - 'db/migrate/20220513093614_add_ding_talk_into_application_settings.rb' + - 'db/migrate/20220513093615_add_ding_talk_tracker_data.rb' + - 'db/migrate/20220627061008_add_fei_shu_integration.rb' + - 'db/migrate/20220708150315_add_vulnerabilities_foreign_key_to_vulnerability_merge_request_links.rb' + - 'db/migrate/20220708150335_add_merge_requests_foreign_key_to_vulnerability_merge_request_links.rb' + - 'db/post_migrate/20220622070547_add_temp_index_for_container_registry_size_migration.rb' + - 'db/post_migrate/20220721140252_prepare_partial_trigram_indexes_for_issues.rb' + - 'db/post_migrate/20220801144713_add_partial_trigram_index_for_issue_title.rb' + - 'db/post_migrate/20220801150028_add_partial_trigram_index_for_issue_description.rb' + - 'ee/app/controllers/ee/search_controller.rb' + - 'ee/app/controllers/groups/analytics/ci_cd_analytics_controller.rb' + - 'ee/app/controllers/groups/saml_group_links_controller.rb' + - 'ee/app/graphql/ee/types/board_list_type.rb' + - 'ee/app/graphql/ee/types/board_type.rb' + - 'ee/app/graphql/ee/types/ci/runner_type.rb' + - 'ee/app/graphql/ee/types/group_type.rb' + - 'ee/app/graphql/ee/types/issue_type.rb' + - 'ee/app/graphql/ee/types/merge_request_type.rb' + - 'ee/app/graphql/ee/types/project_type.rb' + - 'ee/app/graphql/ee/types/query_type.rb' + - 'ee/app/graphql/mutations/iterations/cadences/create.rb' + - 'ee/app/graphql/mutations/iterations/cadences/update.rb' + - 'ee/app/graphql/mutations/iterations/delete.rb' + - 'ee/app/graphql/mutations/projects/set_locked.rb' + - 'ee/app/graphql/resolvers/iterations/cadences_resolver.rb' + - 'ee/app/graphql/resolvers/vulnerabilities_count_per_day_resolver.rb' + - 'ee/app/graphql/types/admin/cloud_licenses/current_license_type.rb' + - 'ee/app/graphql/types/admin/cloud_licenses/license_type.rb' + - 'ee/app/graphql/types/admin/cloud_licenses/subscription_future_entry_type.rb' + - 'ee/app/graphql/types/analytics/devops_adoption/enabled_namespace_type.rb' + - 'ee/app/graphql/types/analytics/devops_adoption/snapshot_type.rb' + - 'ee/app/graphql/types/app_sec/fuzzing/api/ci_configuration_type.rb' + - 'ee/app/graphql/types/app_sec/fuzzing/api/scan_profile_type.rb' + - 'ee/app/graphql/types/app_sec/fuzzing/coverage/corpus_type.rb' + - 'ee/app/graphql/types/boards/epic_board_type.rb' + - 'ee/app/graphql/types/boards/epic_list_type.rb' + - 'ee/app/graphql/types/boards/epic_user_preferences_type.rb' + - 'ee/app/graphql/types/burnup_chart_daily_totals_type.rb' + - 'ee/app/graphql/types/ci/code_coverage_activity_type.rb' + - 'ee/app/graphql/types/ci/code_quality_degradation_type.rb' + - 'ee/app/graphql/types/ci/namespace_ci_cd_setting_type.rb' + - 'ee/app/graphql/types/compliance_management/merge_requests/compliance_violation_type.rb' + - 'ee/app/graphql/types/dast/profile_schedule_type.rb' + - 'ee/app/graphql/types/dast/profile_type.rb' + - 'ee/app/graphql/types/dast_scanner_profile_type.rb' + - 'ee/app/graphql/types/dast_site_profile_type.rb' + - 'ee/app/graphql/types/dast_site_validation_type.rb' + - 'ee/app/graphql/types/dora_type.rb' + - 'ee/app/graphql/types/epic_issue_type.rb' + - 'ee/app/graphql/types/epic_type.rb' + - 'ee/app/graphql/types/external_issue_type.rb' + - 'ee/app/graphql/types/iteration_type.rb' + - 'ee/app/graphql/types/iterations/cadence_type.rb' + - 'ee/app/graphql/types/merge_requests/approval_state_type.rb' + - 'ee/app/graphql/types/namespaces/namespace_ban_type.rb' + - 'ee/app/graphql/types/requirements_management/requirement_type.rb' + - 'ee/app/graphql/types/requirements_management/test_report_type.rb' + - 'ee/app/graphql/types/security/training_type.rb' + - 'ee/app/graphql/types/time_report_stats_type.rb' + - 'ee/app/graphql/types/timebox_report_interface.rb' + - 'ee/app/graphql/types/timebox_report_type.rb' + - 'ee/app/graphql/types/vulnerabilities/asset_type.rb' + - 'ee/app/graphql/types/vulnerabilities/container_image_type.rb' + - 'ee/app/graphql/types/vulnerabilities/link_type.rb' + - 'ee/app/graphql/types/vulnerability/external_issue_link_type.rb' + - 'ee/app/graphql/types/vulnerability/issue_link_type.rb' + - 'ee/app/graphql/types/vulnerability_details/base_type.rb' + - 'ee/app/graphql/types/vulnerability_details/boolean_type.rb' + - 'ee/app/graphql/types/vulnerability_details/code_type.rb' + - 'ee/app/graphql/types/vulnerability_details/commit_type.rb' + - 'ee/app/graphql/types/vulnerability_details/diff_type.rb' + - 'ee/app/graphql/types/vulnerability_details/file_location_type.rb' + - 'ee/app/graphql/types/vulnerability_details/int_type.rb' + - 'ee/app/graphql/types/vulnerability_details/list_type.rb' + - 'ee/app/graphql/types/vulnerability_details/markdown_type.rb' + - 'ee/app/graphql/types/vulnerability_details/module_location_type.rb' + - 'ee/app/graphql/types/vulnerability_details/table_type.rb' + - 'ee/app/graphql/types/vulnerability_details/text_type.rb' + - 'ee/app/graphql/types/vulnerability_details/url_type.rb' + - 'ee/app/graphql/types/vulnerability_location/container_scanning_type.rb' + - 'ee/app/graphql/types/vulnerability_location/coverage_fuzzing_type.rb' + - 'ee/app/graphql/types/vulnerability_location/dast_type.rb' + - 'ee/app/graphql/types/vulnerability_location/dependency_scanning_type.rb' + - 'ee/app/graphql/types/vulnerability_location/generic_type.rb' + - 'ee/app/graphql/types/vulnerability_location/sast_type.rb' + - 'ee/app/graphql/types/vulnerability_location/secret_detection_type.rb' - 'ee/app/graphql/types/vulnerability_request_response_header_type.rb' + - 'ee/app/graphql/types/vulnerability_request_type.rb' + - 'ee/app/graphql/types/vulnerability_response_type.rb' + - 'ee/app/graphql/types/vulnerability_scanner_type.rb' + - 'ee/app/graphql/types/vulnerability_type.rb' + - 'ee/app/graphql/types/vulnerable_dependency_type.rb' + - 'ee/app/graphql/types/vulnerable_kubernetes_resource_type.rb' + - 'ee/app/graphql/types/vulnerable_projects_by_grade_type.rb' + - 'ee/app/graphql/types/work_items/widgets/verification_status_type.rb' + - 'ee/app/graphql/types/work_items/widgets/weight_type.rb' + - 'ee/app/helpers/ee/geo_helper.rb' - 'ee/app/serializers/ee/evidences/release_entity.rb' - 'ee/app/services/ci/external_pull_requests/process_github_event_service.rb' - 'ee/app/services/ci_cd/setup_project.rb' - 'ee/app/services/ee/issues/base_service.rb' - 'ee/app/services/elastic/cluster_reindexing_service.rb' - 'ee/app/services/elastic/process_bookkeeping_service.rb' + - 'ee/app/services/epics/epic_links/list_service.rb' - 'ee/app/services/epics/issue_promote_service.rb' - - 'ee/app/services/external_status_checks/create_service.rb' - 'ee/app/services/groups/memberships/export_service.rb' - 'ee/app/services/projects/setup_ci_cd.rb' - 'ee/app/services/security/security_orchestration_policies/on_demand_scan_pipeline_configuration_service.rb' - 'ee/config/routes/project.rb' - 'ee/config/routes/uploads.rb' + - 'ee/elastic/migrate/20220118150500_delete_orphaned_commits.rb' + - 'ee/elastic/migrate/20220119120500_populate_commit_permissions_in_main_index.rb' - 'ee/lib/api/iterations.rb' - 'ee/lib/api/merge_trains.rb' + - 'ee/lib/api/related_epic_links.rb' - 'ee/lib/api/vulnerability_exports.rb' - 'ee/lib/api/vulnerability_findings.rb' + - 'ee/lib/ee/api/helpers/groups_helpers.rb' - 'ee/lib/ee/api/helpers/issues_helpers.rb' - 'ee/lib/ee/api/helpers/protected_branches_helpers.rb' - 'ee/lib/ee/api/merge_requests.rb' - - 'ee/lib/ee/audit/project_changes_auditor.rb' + - 'ee/lib/ee/audit/project_setting_changes_auditor.rb' + - 'ee/lib/ee/audit/protected_branches_changes_auditor.rb' - 'ee/lib/ee/banzai/filter/references/epic_reference_filter.rb' - 'ee/lib/ee/banzai/filter/references/vulnerability_reference_filter.rb' + - 'ee/lib/ee/gitlab/application_rate_limiter.rb' - 'ee/lib/ee/gitlab/ci/pipeline/chain/validate/after_config.rb' - 'ee/lib/ee/gitlab/quick_actions/issue_actions.rb' + - 'ee/lib/ee/gitlab/tracking.rb' - 'ee/lib/ee/gitlab/usage_data.rb' + - 'ee/lib/elastic/latest/commit_config.rb' - 'ee/lib/elastic/latest/config.rb' - 'ee/lib/elastic/latest/merge_request_config.rb' - 'ee/lib/gem_extensions/elasticsearch/model/indexing/instance_methods.rb' @@ -79,7 +173,9 @@ Layout/HashAlignment: - 'ee/spec/controllers/projects/settings/operations_controller_spec.rb' - 'ee/spec/controllers/trials_controller_spec.rb' - 'ee/spec/factories/dependencies.rb' + - 'ee/spec/factories/projects.rb' - 'ee/spec/features/billings/billing_plans_spec.rb' + - 'ee/spec/features/groups/settings/protected_environments_spec.rb' - 'ee/spec/features/projects/environments/environments_spec.rb' - 'ee/spec/features/projects/feature_flags/user_sees_feature_flag_list_spec.rb' - 'ee/spec/features/projects/feature_flags/user_updates_feature_flag_spec.rb' @@ -87,13 +183,21 @@ Layout/HashAlignment: - 'ee/spec/finders/merge_requests_finder_spec.rb' - 'ee/spec/frontend/fixtures/dast_profiles.rb' - 'ee/spec/graphql/ee/mutations/ci/runner/update_spec.rb' + - 'ee/spec/graphql/ee/resolvers/namespace_projects_resolver_spec.rb' + - 'ee/spec/graphql/resolvers/path_locks_resolver_spec.rb' + - 'ee/spec/graphql/resolvers/security_orchestration/scan_execution_policy_resolver_spec.rb' + - 'ee/spec/graphql/resolvers/security_report_summary_resolver_spec.rb' + - 'ee/spec/graphql/resolvers/vulnerabilities/issue_links_resolver_spec.rb' - 'ee/spec/helpers/billing_plans_helper_spec.rb' - 'ee/spec/helpers/routing/pseudonymization_helper_spec.rb' - 'ee/spec/lib/ee/gitlab/auth/ldap/access_levels_spec.rb' - 'ee/spec/lib/ee/gitlab/auth/ldap/config_spec.rb' + - 'ee/spec/lib/ee/gitlab/background_migration/backfill_project_statistics_container_repository_size_spec.rb' + - 'ee/spec/lib/ee/gitlab/background_migration/delete_invalid_epic_issues_spec.rb' - 'ee/spec/lib/ee/gitlab/background_migration/fix_incorrect_max_seats_used_spec.rb' - 'ee/spec/lib/ee/gitlab/ci/config/entry/need_spec.rb' - 'ee/spec/lib/ee/gitlab/ci/matching/runner_matcher_spec.rb' + - 'ee/spec/lib/ee/gitlab/elastic/helper_spec.rb' - 'ee/spec/lib/ee/gitlab/import_export/group/legacy_tree_saver_spec.rb' - 'ee/spec/lib/ee/gitlab/import_export/group/tree_saver_spec.rb' - 'ee/spec/lib/ee/gitlab/usage_data_spec.rb' @@ -102,32 +206,46 @@ Layout/HashAlignment: - 'ee/spec/lib/gitlab/custom_file_templates_spec.rb' - 'ee/spec/lib/gitlab/elastic/client_spec.rb' - 'ee/spec/lib/gitlab/elastic/indexer_spec.rb' + - 'ee/spec/lib/gitlab/insights/loader_spec.rb' - 'ee/spec/lib/gitlab/template/custom_templates_spec.rb' - 'ee/spec/models/application_setting_spec.rb' - 'ee/spec/models/approval_merge_request_rule_spec.rb' - 'ee/spec/models/member_spec.rb' + - 'ee/spec/models/preloaders/environments/protected_environment_preloader_spec.rb' + - 'ee/spec/models/protected_environments/approval_summary_spec.rb' - 'ee/spec/models/vulnerabilities/statistic_spec.rb' + - 'ee/spec/requests/api/deployments_spec.rb' - 'ee/spec/requests/api/graphql/app_sec/fuzzing/coverage/corpus_type_spec.rb' - 'ee/spec/requests/api/graphql/group/epics_spec.rb' - 'ee/spec/requests/api/internal/base_spec.rb' - 'ee/spec/requests/api/issues_spec.rb' + - 'ee/spec/requests/api/protected_environments_spec.rb' - 'ee/spec/requests/api/templates_spec.rb' + - 'ee/spec/requests/ee/projects/environments_controller_spec.rb' - 'ee/spec/requests/ee/projects/service_desk_controller_spec.rb' - 'ee/spec/requests/projects/security/dast_site_profiles_controller_spec.rb' - 'ee/spec/requests/rack_attack_global_spec.rb' - 'ee/spec/serializers/integrations/zentao_serializers/issue_entity_spec.rb' - 'ee/spec/services/app_sec/dast/profiles/create_associations_service_spec.rb' + - 'ee/spec/services/app_sec/dast/scan_configs/fetch_service_spec.rb' + - 'ee/spec/services/arkose/blocked_users_report_service_spec.rb' - 'ee/spec/services/audit_events/protected_branch_audit_event_service_spec.rb' + - 'ee/spec/services/auto_merge/merge_when_pipeline_succeeds_service_spec.rb' - 'ee/spec/services/ci/create_pipeline_service/cross_needs_artifacts_spec.rb' - 'ee/spec/services/ci/process_pipeline_service_spec.rb' - 'ee/spec/services/ci/retry_pipeline_service_spec.rb' - 'ee/spec/services/ci/subscribe_bridge_service_spec.rb' + - 'ee/spec/services/ee/merge_requests/create_pipeline_service_spec.rb' - 'ee/spec/services/merge_trains/check_status_service_spec.rb' - 'ee/spec/services/merge_trains/create_pipeline_service_spec.rb' - 'ee/spec/services/merge_trains/refresh_merge_request_service_spec.rb' - 'ee/spec/services/merge_trains/refresh_service_spec.rb' - 'ee/spec/services/status_page/trigger_publish_service_spec.rb' - 'ee/spec/services/status_page/unpublish_details_service_spec.rb' + - 'ee/spec/services/vulnerabilities/create_from_security_finding_service_spec.rb' + - 'ee/spec/services/vulnerabilities/findings/create_from_security_finding_service_spec.rb' + - 'ee/spec/services/vulnerabilities/security_finding/create_issue_service_spec.rb' + - 'ee/spec/support/shared_examples/services/audit_event_logging_shared_examples.rb' - 'ee/spec/support/shared_examples/status_page/publish_shared_examples.rb' - 'ee/spec/support/shared_examples/status_page/reference_links_examples.rb' - 'ee/spec/workers/scan_security_report_secrets_worker_spec.rb' @@ -144,6 +262,7 @@ Layout/HashAlignment: - 'lib/api/deploy_tokens.rb' - 'lib/api/entities/project.rb' - 'lib/api/feature_flags.rb' + - 'lib/api/features.rb' - 'lib/api/group_labels.rb' - 'lib/api/group_packages.rb' - 'lib/api/groups.rb' @@ -180,6 +299,7 @@ Layout/HashAlignment: - 'lib/gitlab/auth/o_auth/auth_hash.rb' - 'lib/gitlab/auth/o_auth/provider.rb' - 'lib/gitlab/auth/o_auth/user.rb' + - 'lib/gitlab/auth/otp/strategies/forti_authenticator/manual_otp.rb' - 'lib/gitlab/background_migration/backfill_project_repositories.rb' - 'lib/gitlab/background_migration/recalculate_vulnerabilities_occurrences_uuid.rb' - 'lib/gitlab/ci/ansi2html.rb' @@ -188,7 +308,7 @@ Layout/HashAlignment: - 'lib/gitlab/ci/jwt_v2.rb' - 'lib/gitlab/ci/pipeline/chain/validate/external.rb' - 'lib/gitlab/ci/reports/security/scanner.rb' - - 'lib/gitlab/database/partitioning/sliding_list_strategy.rb' + - 'lib/gitlab/database/background_migration/health_status.rb' - 'lib/gitlab/database/reflection.rb' - 'lib/gitlab/diff/file_collection/compare.rb' - 'lib/gitlab/email/attachment_uploader.rb' @@ -206,6 +326,7 @@ Layout/HashAlignment: - 'lib/gitlab/import_export/members_mapper.rb' - 'lib/gitlab/import_export/project/import_task.rb' - 'lib/gitlab/import_export/shared.rb' + - 'lib/gitlab/issuable/clone/copy_resource_events_service.rb' - 'lib/gitlab/kubernetes.rb' - 'lib/gitlab/marginalia/comment.rb' - 'lib/gitlab/metrics/dashboard/stages/grafana_formatter.rb' @@ -225,46 +346,66 @@ Layout/HashAlignment: - 'lib/tasks/gitlab/import_export/export.rake' - 'lib/tasks/gitlab/import_export/import.rake' - 'lib/tasks/tanuki_emoji.rake' - - 'qa/qa/specs/features/browser_ui/3_create/jenkins/jenkins_build_status_spec.rb' - - 'qa/qa/specs/features/ee/browser_ui/1_manage/project/project_templates_spec.rb' + - 'qa/qa/specs/features/browser_ui/3_create/source_editor/source_editor_toolbar_spec.rb' + - 'qa/qa/specs/features/ee/browser_ui/13_secure/change_vulnerability_status_spec.rb' + - 'qa/qa/specs/features/ee/browser_ui/13_secure/security_reports_spec.rb' + - 'qa/qa/specs/features/ee/browser_ui/1_manage/group/group_saml_enforced_sso_git_access_spec.rb' + - 'qa/qa/specs/features/ee/browser_ui/1_manage/group/group_saml_non_enforced_sso_spec.rb' + - 'qa/qa/specs/features/ee/browser_ui/3_create/repository/project_templates_spec.rb' - 'qa/qa/specs/features/ee/browser_ui/3_create/repository/push_rules_spec.rb' + - 'qa/qa/specs/features/ee/browser_ui/5_package/dependency_proxy_sso_spec.rb' - 'qa/qa/support/loglinking.rb' - 'qa/spec/support/loglinking_spec.rb' - 'spec/controllers/concerns/product_analytics_tracking_spec.rb' - 'spec/controllers/concerns/redis_tracking_spec.rb' + - 'spec/controllers/import/bitbucket_controller_spec.rb' - 'spec/controllers/oauth/token_info_controller_spec.rb' - 'spec/controllers/omniauth_callbacks_controller_spec.rb' - 'spec/controllers/projects/artifacts_controller_spec.rb' - 'spec/controllers/projects/feature_flags_controller_spec.rb' - 'spec/controllers/projects/grafana_api_controller_spec.rb' - - 'spec/controllers/projects/issues_controller_spec.rb' - 'spec/controllers/projects/merge_requests_controller_spec.rb' + - 'spec/controllers/projects/pipeline_schedules_controller_spec.rb' - 'spec/controllers/projects/registry/tags_controller_spec.rb' - 'spec/controllers/projects/service_desk_controller_spec.rb' - - 'spec/controllers/search_controller_spec.rb' + - 'spec/db/migration_spec.rb' - 'spec/factories/ci/builds.rb' - - 'spec/factories/ci/stages.rb' + - 'spec/factories/environments.rb' - 'spec/factories/groups.rb' - 'spec/features/dashboard/datetime_on_tooltips_spec.rb' - - 'spec/features/groups/issues_spec.rb' + - 'spec/features/dashboard/todos/todos_sorting_spec.rb' + - 'spec/features/jira_oauth_provider_authorize_spec.rb' + - 'spec/features/merge_request/user_sees_deployment_widget_spec.rb' - 'spec/features/profiles/active_sessions_spec.rb' - 'spec/features/projects/badges/coverage_spec.rb' + - 'spec/features/projects/environments/environment_spec.rb' - 'spec/features/projects/feature_flags/user_sees_feature_flag_list_spec.rb' - 'spec/features/projects/feature_flags/user_updates_feature_flag_spec.rb' - 'spec/features/projects/jobs/user_browses_jobs_spec.rb' - 'spec/features/projects/milestones/milestones_sorting_spec.rb' - 'spec/features/projects/new_project_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/snippets/user_creates_snippet_spec.rb' + - 'spec/features/users/email_verification_on_login_spec.rb' - 'spec/features/users/login_spec.rb' - 'spec/finders/ci/pipelines_for_merge_request_finder_spec.rb' - 'spec/finders/group_descendants_finder_spec.rb' - 'spec/finders/group_members_finder_spec.rb' - 'spec/finders/template_finder_spec.rb' - 'spec/graphql/mutations/releases/update_spec.rb' + - 'spec/graphql/resolvers/board_lists_resolver_spec.rb' - 'spec/graphql/resolvers/ci/config_resolver_spec.rb' + - 'spec/graphql/resolvers/ci/group_runners_resolver_spec.rb' + - 'spec/graphql/resolvers/ci/jobs_resolver_spec.rb' + - 'spec/graphql/resolvers/ci/runners_resolver_spec.rb' + - 'spec/graphql/resolvers/container_repositories_resolver_spec.rb' + - 'spec/graphql/resolvers/container_repository_tags_resolver_spec.rb' - 'spec/graphql/resolvers/design_management/versions_resolver_spec.rb' + - 'spec/graphql/resolvers/work_items_resolver_spec.rb' + - 'spec/helpers/ci/builds_helper_spec.rb' - 'spec/helpers/sorting_helper_spec.rb' - 'spec/helpers/storage_helper_spec.rb' - 'spec/helpers/wiki_helper_spec.rb' @@ -277,6 +418,8 @@ Layout/HashAlignment: - 'spec/lib/gitlab/auth/ldap/person_spec.rb' - 'spec/lib/gitlab/auth/o_auth/auth_hash_spec.rb' - 'spec/lib/gitlab/auth/otp/strategies/forti_token_cloud_spec.rb' + - 'spec/lib/gitlab/background_migration/backfill_imported_issue_search_data_spec.rb' + - 'spec/lib/gitlab/background_migration/backfill_integrations_enable_ssl_verification_spec.rb' - 'spec/lib/gitlab/background_migration/backfill_snippet_repositories_spec.rb' - 'spec/lib/gitlab/background_migration/encrypt_integration_properties_spec.rb' - 'spec/lib/gitlab/ci/config/entry/port_spec.rb' @@ -286,6 +429,7 @@ Layout/HashAlignment: - 'spec/lib/gitlab/ci/pipeline/seed/deployment_spec.rb' - 'spec/lib/gitlab/ci/variables/builder_spec.rb' - 'spec/lib/gitlab/ci/yaml_processor_spec.rb' + - 'spec/lib/gitlab/data_builder/issuable_spec.rb' - 'spec/lib/gitlab/data_builder/note_spec.rb' - 'spec/lib/gitlab/database/migration_helpers_spec.rb' - 'spec/lib/gitlab/database/partitioning/sliding_list_strategy_spec.rb' @@ -307,6 +451,8 @@ Layout/HashAlignment: - 'spec/lib/gitlab/import_export/project/sample/relation_tree_restorer_spec.rb' - 'spec/lib/gitlab/import_sources_spec.rb' - 'spec/lib/gitlab/instrumentation_helper_spec.rb' + - 'spec/lib/gitlab/jira/middleware_spec.rb' + - 'spec/lib/gitlab/markdown_cache/active_record/extension_spec.rb' - 'spec/lib/gitlab/metrics/dashboard/importers/prometheus_metrics_spec.rb' - 'spec/lib/gitlab/metrics/dashboard/validator/errors_spec.rb' - 'spec/lib/gitlab/metrics/dashboard/validator_spec.rb' @@ -317,9 +463,12 @@ Layout/HashAlignment: - 'spec/lib/gitlab/metrics/web_transaction_spec.rb' - 'spec/lib/gitlab/omniauth_initializer_spec.rb' - 'spec/lib/gitlab/sidekiq_daemon/memory_killer_spec.rb' + - 'spec/lib/gitlab/sidekiq_death_handler_spec.rb' + - 'spec/lib/gitlab/sidekiq_middleware/server_metrics_spec.rb' - 'spec/lib/gitlab/slug/environment_spec.rb' - 'spec/lib/gitlab/tracking_spec.rb' - 'spec/lib/gitlab/usage_data/topology_spec.rb' + - 'spec/lib/gitlab/usage_data_counters/merge_request_activity_unique_counter_spec.rb' - 'spec/lib/gitlab/usage_data_counters/note_counter_spec.rb' - 'spec/lib/gitlab/usage_data_spec.rb' - 'spec/lib/gitlab/utils_spec.rb' @@ -333,8 +482,11 @@ Layout/HashAlignment: - 'spec/migrations/20211126204445_add_task_to_work_item_types_spec.rb' - 'spec/models/ci/build_spec.rb' - 'spec/models/ci/pipeline_spec.rb' + - 'spec/models/ci/processable_spec.rb' - 'spec/models/clusters/platforms/kubernetes_spec.rb' + - 'spec/models/commit_status_spec.rb' - 'spec/models/container_registry/event_spec.rb' + - 'spec/models/deployment_spec.rb' - 'spec/models/design_management/version_spec.rb' - 'spec/models/group_spec.rb' - 'spec/models/integrations/chat_message/pipeline_message_spec.rb' @@ -343,7 +495,6 @@ Layout/HashAlignment: - 'spec/models/namespace_spec.rb' - 'spec/models/operations/feature_flag_spec.rb' - 'spec/models/pages_domain_spec.rb' - - 'spec/models/project_spec.rb' - 'spec/models/remote_mirror_spec.rb' - 'spec/models/repository_spec.rb' - 'spec/models/user_spec.rb' @@ -354,9 +505,12 @@ Layout/HashAlignment: - 'spec/requests/api/ci/runner/jobs_request_post_spec.rb' - 'spec/requests/api/feature_flags_spec.rb' - 'spec/requests/api/graphql/ci/config_spec.rb' + - 'spec/requests/api/graphql/ci/group_variables_spec.rb' + - 'spec/requests/api/graphql/ci/instance_variables_spec.rb' + - 'spec/requests/api/graphql/ci/project_variables_spec.rb' - 'spec/requests/api/graphql/ci/runner_spec.rb' + - 'spec/requests/api/graphql/ci/runners_spec.rb' - 'spec/requests/api/graphql/mutations/releases/update_spec.rb' - - 'spec/requests/api/graphql/packages/conan_spec.rb' - 'spec/requests/api/graphql/project/issue/design_collection/version_spec.rb' - 'spec/requests/api/graphql/project/terraform/state_spec.rb' - 'spec/requests/api/graphql/project/terraform/states_spec.rb' @@ -364,21 +518,29 @@ Layout/HashAlignment: - 'spec/requests/api/groups_spec.rb' - 'spec/requests/api/internal/base_spec.rb' - 'spec/requests/api/issues/get_group_issues_spec.rb' + - 'spec/requests/api/projects_spec.rb' - 'spec/requests/api/suggestions_spec.rb' - 'spec/requests/api/unleash_spec.rb' - 'spec/requests/git_http_spec.rb' + - 'spec/requests/oauth_tokens_spec.rb' - 'spec/requests/openid_connect_spec.rb' + - 'spec/requests/projects/environments_controller_spec.rb' - 'spec/requests/projects/merge_requests_discussions_spec.rb' - 'spec/routing/project_routing_spec.rb' - 'spec/serializers/ci/lint/job_entity_spec.rb' - 'spec/serializers/container_repository_entity_spec.rb' + - 'spec/serializers/deployment_entity_spec.rb' + - 'spec/serializers/environment_serializer_spec.rb' - 'spec/serializers/merge_request_metrics_helper_spec.rb' - 'spec/services/ci/create_downstream_pipeline_service_spec.rb' - 'spec/services/ci/create_pipeline_service/logger_spec.rb' - 'spec/services/ci/create_pipeline_service/tags_spec.rb' - 'spec/services/ci/job_artifacts/create_service_spec.rb' + - 'spec/services/ci/retry_job_service_spec.rb' - 'spec/services/deployments/link_merge_requests_service_spec.rb' - 'spec/services/discussions/capture_diff_note_positions_service_spec.rb' + - 'spec/services/environments/stop_service_spec.rb' + - 'spec/services/event_create_service_spec.rb' - 'spec/services/groups/import_export/import_service_spec.rb' - 'spec/services/issuable/bulk_update_service_spec.rb' - 'spec/services/issues/create_service_spec.rb' @@ -390,7 +552,9 @@ Layout/HashAlignment: - 'spec/services/notes/destroy_service_spec.rb' - 'spec/services/packages/debian/parse_debian822_service_spec.rb' - 'spec/services/projects/destroy_service_spec.rb' + - 'spec/services/service_ping/submit_service_ping_service_spec.rb' - 'spec/services/suggestions/apply_service_spec.rb' + - 'spec/services/work_items/widgets/description_service/update_service_spec.rb' - 'spec/support/helpers/create_environments_helpers.rb' - 'spec/support/helpers/kubernetes_helpers.rb' - 'spec/support/helpers/migrations_helpers/work_item_types_helper.rb' @@ -402,6 +566,8 @@ Layout/HashAlignment: - 'spec/support/shared_contexts/bulk_imports_requests_shared_context.rb' - 'spec/support/shared_contexts/design_management_shared_contexts.rb' - 'spec/support/shared_contexts/finders/merge_requests_finder_shared_contexts.rb' + - 'spec/support/shared_examples/finders/issues_finder_shared_examples.rb' + - 'spec/support/shared_examples/graphql/members_shared_examples.rb' - 'spec/support/shared_examples/lib/banzai/filters/sanitization_filter_shared_examples.rb' - 'spec/support/shared_examples/lib/gitlab/database/background_migration_job_shared_examples.rb' - 'spec/support/shared_examples/requests/api/conan_packages_shared_examples.rb' diff --git a/app/views/layouts/_snowplow.html.haml b/app/views/layouts/_snowplow.html.haml index 0dad6d367c3486b889e09efa419cf7a218be9858..22cc8027202d176ebd1f7d4a5ebc5e62ac40de50 100644 --- a/app/views/layouts/_snowplow.html.haml +++ b/app/views/layouts/_snowplow.html.haml @@ -12,6 +12,9 @@ window.snowplowOptions = #{Gitlab::Tracking.options(@group).to_json} gl = window.gl || {}; - gl.snowplowStandardContext = #{Gitlab::Tracking::StandardContext.new(namespace: namespace, - project: @project, user: current_user).to_context.to_json.to_json} + gl.snowplowStandardContext = #{Gitlab::Tracking::StandardContext.new( + namespace: namespace, + project: @project, + user: current_user + ).to_context.to_json.to_json} gl.snowplowPseudonymizedPageUrl = #{masked_page_url(group: namespace, project: @project).to_json}; diff --git a/ee/app/graphql/types/vulnerabilities_count_by_day_type.rb b/ee/app/graphql/types/vulnerabilities_count_by_day_type.rb index 6a9bc34627df6c4ce3feab51af65bb6234bd270e..ade667629e26aa1c4e0994df78b50d0c5347d173 100644 --- a/ee/app/graphql/types/vulnerabilities_count_by_day_type.rb +++ b/ee/app/graphql/types/vulnerabilities_count_by_day_type.rb @@ -8,11 +8,15 @@ class VulnerabilitiesCountByDayType < BaseObject field :date, GraphQL::Types::ISO8601Date, null: false, description: 'Date for the count.' - field :total, GraphQL::Types::Int, null: false, + field :total, + GraphQL::Types::Int, + null: false, description: 'Total number of vulnerabilities on a particular day.' ::Enums::Vulnerability.severity_levels.keys.each do |severity| - field severity.to_s, GraphQL::Types::Int, null: false, + field severity.to_s, + GraphQL::Types::Int, + null: false, description: "Total number of vulnerabilities on a particular day with #{severity} severity" end end diff --git a/ee/app/graphql/types/vulnerability_evidence_source_type.rb b/ee/app/graphql/types/vulnerability_evidence_source_type.rb index 366552b1cc8eb78841196a2afd6e8881790063ab..24d355075e4951009db3e4e00039ce5a1a615cc0 100644 --- a/ee/app/graphql/types/vulnerability_evidence_source_type.rb +++ b/ee/app/graphql/types/vulnerability_evidence_source_type.rb @@ -12,10 +12,14 @@ class VulnerabilityEvidenceSourceType < BaseObject method: :id, description: 'ID of the Vulnerability Evidence Source.' - field :name, GraphQL::Types::String, null: false, + field :name, + GraphQL::Types::String, + null: false, description: 'Name of the Vulnerability Evidence Source.' - field :url, GraphQL::Types::String, null: true, + field :url, + GraphQL::Types::String, + null: true, description: 'URL of the Vulnerability Evidence Source.' end # rubocop: enable Graphql/AuthorizeTypes diff --git a/ee/app/graphql/types/vulnerability_evidence_supporting_message_type.rb b/ee/app/graphql/types/vulnerability_evidence_supporting_message_type.rb index 9e86560f48033b72e4ae325eb57e470d03875dad..6f068582c86a235c5dc06c7fc42311d0c582df1a 100644 --- a/ee/app/graphql/types/vulnerability_evidence_supporting_message_type.rb +++ b/ee/app/graphql/types/vulnerability_evidence_supporting_message_type.rb @@ -6,13 +6,19 @@ class VulnerabilityEvidenceSupportingMessageType < BaseObject graphql_name 'VulnerabilityEvidenceSupportingMessage' description 'Represents a vulnerability evidence supporting message' - field :name, GraphQL::Types::String, null: false, + field :name, + GraphQL::Types::String, + null: false, description: 'Name of the vulnerability supporting message.' - field :request, VulnerabilityRequestType, null: true, + field :request, + VulnerabilityRequestType, + null: true, description: 'HTTP request of the vulnerability evidence supporting message.' - field :response, VulnerabilityResponseType, null: true, + field :response, + VulnerabilityResponseType, + null: true, description: 'HTTP response of the vulnerability evidence supporting message.' end # rubocop: enable Graphql/AuthorizeTypes diff --git a/ee/app/graphql/types/vulnerability_evidence_type.rb b/ee/app/graphql/types/vulnerability_evidence_type.rb index 4ccc8a81d4748b09ecd0ab5df2aaf384cc6a7378..dd33be90c99c56d77ecd5ae98c7ffea1c0b263ed 100644 --- a/ee/app/graphql/types/vulnerability_evidence_type.rb +++ b/ee/app/graphql/types/vulnerability_evidence_type.rb @@ -6,19 +6,29 @@ class VulnerabilityEvidenceType < BaseObject graphql_name 'VulnerabilityEvidence' description 'Represents a Vulnerability Evidence' - field :summary, GraphQL::Types::String, null: true, + field :summary, + GraphQL::Types::String, + null: true, description: 'Summary of the Vulnerability Evidence.' - field :supporting_messages, [VulnerabilityEvidenceSupportingMessageType], null: true, + field :supporting_messages, + [VulnerabilityEvidenceSupportingMessageType], + null: true, description: 'Supporting messages of the Vulnerability Evidence.' - field :source, VulnerabilityEvidenceSourceType, null: true, + field :source, + VulnerabilityEvidenceSourceType, + null: true, description: 'Source of the Vulnerability Evidence.' - field :request, VulnerabilityRequestType, null: true, + field :request, + VulnerabilityRequestType, + null: true, description: 'HTTP request of the Vulnerability Evidence.' - field :response, VulnerabilityResponseType, null: true, + field :response, + VulnerabilityResponseType, + null: true, description: 'HTTP response of the Vulnerability Evidence.' end # rubocop: enable Graphql/AuthorizeTypes diff --git a/ee/app/graphql/types/vulnerability_identifier_type.rb b/ee/app/graphql/types/vulnerability_identifier_type.rb index 42c0bd8dcd3389e0b024759cb9ec56ab8cee9b8d..63a22b38f587d5425e48826fcd0ba463e60d9e1c 100644 --- a/ee/app/graphql/types/vulnerability_identifier_type.rb +++ b/ee/app/graphql/types/vulnerability_identifier_type.rb @@ -6,16 +6,24 @@ class VulnerabilityIdentifierType < BaseObject graphql_name 'VulnerabilityIdentifier' description 'Represents a vulnerability identifier' - field :name, GraphQL::Types::String, null: true, + field :name, + GraphQL::Types::String, + null: true, description: 'Name of the vulnerability identifier.' - field :url, GraphQL::Types::String, null: true, + field :url, + GraphQL::Types::String, + null: true, description: 'URL of the vulnerability identifier.' - field :external_type, GraphQL::Types::String, null: true, + field :external_type, + GraphQL::Types::String, + null: true, description: 'External type of the vulnerability identifier.' - field :external_id, GraphQL::Types::String, null: true, + field :external_id, + GraphQL::Types::String, + null: true, description: 'External ID of the vulnerability identifier.' end # rubocop: enable Graphql/AuthorizeTypes