From 35e1f69e79e37950f3d3219599fe4366d3f2a6cc Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 15 Apr 2025 00:07:34 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .eslint_todo/vue-no-unused-properties.mjs | 1 - .rubocop_todo/gitlab/bounded_contexts.yml | 2 +- .../example_heredoc_delimiter.yml | 3 - .rubocop_todo/layout/array_alignment.yml | 1 - .../layout/line_continuation_spacing.yml | 2 - ...e_end_string_concatenation_indentation.yml | 4 - .rubocop_todo/layout/line_length.yml | 3 - .rubocop_todo/performance/map_compact.yml | 1 - .../string_identifier_argument.yml | 1 - .rubocop_todo/rails/strong_params.yml | 1 - .rubocop_todo/rspec/any_instance_of.yml | 1 - .rubocop_todo/rspec/context_wording.yml | 1 - .rubocop_todo/rspec/expect_change.yml | 1 - .../rspec/factory_bot/avoid_create.yml | 1 - .rubocop_todo/rspec/feature_category.yml | 9 -- .rubocop_todo/rspec/named_subject.yml | 5 - .rubocop_todo/rspec/receive_messages.yml | 2 - .rubocop_todo/rspec/verified_doubles.yml | 1 - .rubocop_todo/style/format_string.yml | 1 - .../style/inline_disable_annotation.yml | 1 - .rubocop_todo/style/super_arguments.yml | 1 - .../components/alerts_integrations_list.vue | 7 -- .../ci_cd_analytics_area_chart.vue | 0 .../components}/ci_cd_analytics_charts.vue | 0 .../ci_cd/components}/constants.js | 0 .../behaviors/shortcuts/keybindings.js | 3 +- .../charts/components/pipelines_dashboard.vue | 2 +- .../components/frequent_item.vue | 8 +- .../components/frequent_items.vue | 12 +- .../global_search_autocomplete_items.vue | 74 +++++++----- .../global_search_default_issuables.vue | 34 +++--- .../global_search_default_places.vue | 26 +++-- ...ay.vue => global_search_focus_overlay.vue} | 8 +- .../components/global_search_scoped_items.vue | 38 +++--- .../stylesheets/framework/super_sidebar.scss | 7 +- .../page_bundles/merge_requests.scss | 6 +- .../page_bundles/notes/_notes_base.scss | 6 +- ...recate-ropc-without-client-credentials.yml | 60 ++++++++++ .../sec/analyzer_development_guide.md | 4 +- doc/update/deprecations.md | 21 ++++ .../vulnerabilities/_index.md | 4 +- lib/api/helpers/snippets/http_response_map.rb | 3 + lib/gitlab/utils/traversal_id_compactor.rb | 2 +- locale/gitlab.pot | 12 -- .../ci_cd_analytics_area_chart_spec.js.snap | 0 .../ci_cd_analytics_area_chart_spec.js | 2 +- .../components/ci_cd_analytics_charts_spec.js | 6 +- .../charts => analytics/ci_cd}/mock_data.js | 0 .../pipelines_dashboard_clickhouse_spec.js | 2 +- .../components/pipelines_dashboard_spec.js | 4 +- .../charts/components/statistics_list_spec.js | 3 +- .../components/frequent_item_spec.js | 4 +- .../components/frequent_items_spec.js | 4 +- .../global_search_autocomplete_items_spec.js | 109 ++++++++++++++++-- .../global_search_default_issuables_spec.js | 55 +++------ .../global_search_default_places_spec.js | 10 +- ...js => global_search_focus_overlay_spec.js} | 6 +- .../snippets/http_response_map_spec.rb | 3 + .../utils/traversal_id_compactor_spec.rb | 6 +- .../authorizations_compactor_spec.rb | 7 +- 60 files changed, 357 insertions(+), 244 deletions(-) rename app/assets/javascripts/{vue_shared/components/ci_cd_analytics => analytics/ci_cd/components}/ci_cd_analytics_area_chart.vue (100%) rename app/assets/javascripts/{vue_shared/components/ci_cd_analytics => analytics/ci_cd/components}/ci_cd_analytics_charts.vue (100%) rename app/assets/javascripts/{vue_shared/components/ci_cd_analytics => analytics/ci_cd/components}/constants.js (100%) rename app/assets/javascripts/super_sidebar/components/global_search/components/{global_search_hover_overlay.vue => global_search_focus_overlay.vue} (70%) create mode 100644 data/deprecations/17-11-deprecate-ropc-without-client-credentials.yml rename spec/frontend/{projects/pipelines/charts => analytics/ci_cd}/components/__snapshots__/ci_cd_analytics_area_chart_spec.js.snap (100%) rename spec/frontend/{projects/pipelines/charts => analytics/ci_cd}/components/ci_cd_analytics_area_chart_spec.js (86%) rename spec/frontend/{projects/pipelines/charts => analytics/ci_cd}/components/ci_cd_analytics_charts_spec.js (91%) rename spec/frontend/{projects/pipelines/charts => analytics/ci_cd}/mock_data.js (100%) rename spec/frontend/super_sidebar/components/global_search/components/{global_search_hover_overlay_spec.js => global_search_focus_overlay_spec.js} (83%) diff --git a/.eslint_todo/vue-no-unused-properties.mjs b/.eslint_todo/vue-no-unused-properties.mjs index a5e136e2ab0..dd6d940e633 100644 --- a/.eslint_todo/vue-no-unused-properties.mjs +++ b/.eslint_todo/vue-no-unused-properties.mjs @@ -7,7 +7,6 @@ export default { 'app/assets/javascripts/admin/abuse_report/components/notes/abuse_report_comment_form.vue', 'app/assets/javascripts/admin/abuse_report/components/notes/abuse_report_edit_note.vue', 'app/assets/javascripts/admin/statistics_panel/components/app.vue', - 'app/assets/javascripts/alerts_settings/components/alerts_integrations_list.vue', 'app/assets/javascripts/analytics/cycle_analytics/components/base.vue', 'app/assets/javascripts/analytics/shared/components/projects_dropdown_filter.vue', 'app/assets/javascripts/analytics/usage_trends/components/users_chart.vue', diff --git a/.rubocop_todo/gitlab/bounded_contexts.yml b/.rubocop_todo/gitlab/bounded_contexts.yml index dfa1c07e598..786cf69baf7 100644 --- a/.rubocop_todo/gitlab/bounded_contexts.yml +++ b/.rubocop_todo/gitlab/bounded_contexts.yml @@ -3633,8 +3633,8 @@ Gitlab/BoundedContexts: - 'ee/lib/quality/seeders/dependencies.rb' - 'ee/lib/quality/seeders/insights/issues.rb' - 'ee/lib/quality/seeders/vulnerabilities.rb' - - 'ee/lib/sidebars/admin/menus/duo_settings_menu.rb' - 'ee/lib/sidebars/admin/menus/credentials_menu.rb' + - 'ee/lib/sidebars/admin/menus/duo_settings_menu.rb' - 'ee/lib/sidebars/admin/menus/geo_menu.rb' - 'ee/lib/sidebars/admin/menus/push_rules_menu.rb' - 'ee/lib/sidebars/admin/menus/self_hosted_models_menu.rb' diff --git a/.rubocop_todo/internal_affairs/example_heredoc_delimiter.yml b/.rubocop_todo/internal_affairs/example_heredoc_delimiter.yml index db8d8f80b72..760c903324a 100644 --- a/.rubocop_todo/internal_affairs/example_heredoc_delimiter.yml +++ b/.rubocop_todo/internal_affairs/example_heredoc_delimiter.yml @@ -98,8 +98,5 @@ InternalAffairs/ExampleHeredocDelimiter: - 'spec/rubocop/cop/sidekiq_load_balancing/worker_data_consistency_spec.rb' - 'spec/rubocop/cop/sidekiq_options_queue_spec.rb' - 'spec/rubocop/cop/sidekiq_redis_call_spec.rb' - - 'spec/rubocop/cop/usage_data/distinct_count_by_large_foreign_key_spec.rb' - 'spec/rubocop/cop/usage_data/histogram_with_large_table_spec.rb' - - 'spec/rubocop/cop/usage_data/instrumentation_superclass_spec.rb' - - 'spec/rubocop/cop/usage_data/large_table_spec.rb' - 'spec/rubocop/cop/user_admin_spec.rb' diff --git a/.rubocop_todo/layout/array_alignment.yml b/.rubocop_todo/layout/array_alignment.yml index 0b1f3503ed2..09aa84a4b3c 100644 --- a/.rubocop_todo/layout/array_alignment.yml +++ b/.rubocop_todo/layout/array_alignment.yml @@ -153,7 +153,6 @@ Layout/ArrayAlignment: - 'spec/lib/gitlab/graphql/loaders/batch_model_loader_spec.rb' - 'spec/lib/gitlab/i18n/po_linter_spec.rb' - 'spec/lib/gitlab/import_export/attributes_finder_spec.rb' - - 'spec/lib/gitlab/import_export/members_mapper_spec.rb' - 'spec/lib/gitlab/issuable_sorter_spec.rb' - 'spec/lib/gitlab/kroki_spec.rb' - 'spec/lib/gitlab/language_detection_spec.rb' diff --git a/.rubocop_todo/layout/line_continuation_spacing.yml b/.rubocop_todo/layout/line_continuation_spacing.yml index f8d827b689c..053cc3eb425 100644 --- a/.rubocop_todo/layout/line_continuation_spacing.yml +++ b/.rubocop_todo/layout/line_continuation_spacing.yml @@ -142,8 +142,6 @@ Layout/LineContinuationSpacing: - 'spec/services/users/migrate_records_to_ghost_user_service_spec.rb' - 'spec/support/helpers/redis_without_keys.rb' - 'spec/support/shared_examples/features/project_upload_files_shared_examples.rb' - - 'spec/support/shared_examples/harbor/artifacts_controller_shared_examples.rb' - - 'spec/support/shared_examples/harbor/tags_controller_shared_examples.rb' - 'spec/support/shared_examples/models/diff_note_after_commit_shared_examples.rb' - 'spec/support/shared_examples/requests/api/diff_discussions_shared_examples.rb' - 'spec/support/shared_examples/requests/api/discussions_shared_examples.rb' diff --git a/.rubocop_todo/layout/line_end_string_concatenation_indentation.yml b/.rubocop_todo/layout/line_end_string_concatenation_indentation.yml index 4ed802d9759..cc68aacf900 100644 --- a/.rubocop_todo/layout/line_end_string_concatenation_indentation.yml +++ b/.rubocop_todo/layout/line_end_string_concatenation_indentation.yml @@ -390,7 +390,6 @@ Layout/LineEndStringConcatenationIndentation: - 'qa/qa/service/docker_run/product_analytics/browser_sdk_app.rb' - 'qa/qa/service/docker_run/product_analytics/dotnet_sdk_app.rb' - 'qa/qa/specs/features/ee/api/10_govern/compliance_pipeline_spec.rb' - - 'qa/qa/specs/features/ee/browser_ui/10_govern/export_vulnerability_report_spec.rb' - 'qa/qa/support/system_logs/kibana.rb' - 'qa/qa/tools/revoke_user_personal_access_tokens.rb' - 'qa/qa/tools/test_resources_handler.rb' @@ -548,7 +547,6 @@ Layout/LineEndStringConcatenationIndentation: - 'spec/requests/api/projects_spec.rb' - 'spec/requests/api/releases_spec.rb' - 'spec/requests/projects/google_cloud/databases_controller_spec.rb' - - 'spec/requests/pwa_controller_spec.rb' - 'spec/requests/verifies_with_email_spec.rb' - 'spec/rubocop/cop/api/grape_array_missing_coerce_spec.rb' - 'spec/rubocop/cop/group_public_or_visible_to_user_spec.rb' @@ -595,8 +593,6 @@ Layout/LineEndStringConcatenationIndentation: - 'spec/support/shared_examples/features/inviting_members_shared_examples.rb' - 'spec/support/shared_examples/features/project_upload_files_shared_examples.rb' - 'spec/support/shared_examples/features/value_streams_dashboard_shared_examples.rb' - - 'spec/support/shared_examples/harbor/artifacts_controller_shared_examples.rb' - - 'spec/support/shared_examples/harbor/tags_controller_shared_examples.rb' - 'spec/support/shared_examples/lib/email/email_shared_examples.rb' - 'spec/support/shared_examples/models/concerns/avatarable_shared_examples.rb' - 'spec/support/shared_examples/models/diff_note_after_commit_shared_examples.rb' diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml index 8ec3d465d35..bbbd666b0c7 100644 --- a/.rubocop_todo/layout/line_length.yml +++ b/.rubocop_todo/layout/line_length.yml @@ -423,11 +423,9 @@ Layout/LineLength: - 'ee/app/controllers/ee/admin/users_controller.rb' - 'ee/app/controllers/ee/application_controller.rb' - 'ee/app/controllers/ee/groups/group_members_controller.rb' - - 'ee/app/controllers/ee/groups_controller.rb' - 'ee/app/controllers/ee/projects/deploy_tokens_controller.rb' - 'ee/app/controllers/ee/projects/settings/operations_controller.rb' - 'ee/app/controllers/ee/projects/settings/repository_controller.rb' - - 'ee/app/controllers/ee/projects_controller.rb' - 'ee/app/controllers/ee/repositories/git_http_client_controller.rb' - 'ee/app/controllers/ee/repositories/git_http_controller.rb' - 'ee/app/controllers/ee/repositories/lfs_api_controller.rb' @@ -3153,7 +3151,6 @@ Layout/LineLength: - 'spec/lib/gitlab/github_import/importer/lfs_object_importer_spec.rb' - 'spec/lib/gitlab/github_import/object_counter_spec.rb' - 'spec/lib/gitlab/gpg/commit_spec.rb' - - 'spec/lib/gitlab/gpg/invalid_gpg_signature_updater_spec.rb' - 'spec/lib/gitlab/graphql/loaders/batch_lfs_oid_loader_spec.rb' - 'spec/lib/gitlab/graphql/pagination/connections_spec.rb' - 'spec/lib/gitlab/graphql/pagination/keyset/connection_spec.rb' diff --git a/.rubocop_todo/performance/map_compact.yml b/.rubocop_todo/performance/map_compact.yml index 28f1bbe7489..d3b109edcf6 100644 --- a/.rubocop_todo/performance/map_compact.yml +++ b/.rubocop_todo/performance/map_compact.yml @@ -25,7 +25,6 @@ Performance/MapCompact: - 'app/services/cloud_seed/google_cloud/fetch_google_ip_list_service.rb' - 'app/services/events/render_service.rb' - 'app/services/feature_flags/update_service.rb' - - 'app/services/git/base_hooks_service.rb' - 'app/services/jira_import/start_import_service.rb' - 'app/services/jira_import/users_mapper_service.rb' - 'app/services/labels/available_labels_service.rb' diff --git a/.rubocop_todo/performance/string_identifier_argument.yml b/.rubocop_todo/performance/string_identifier_argument.yml index f338867c508..95da557166b 100644 --- a/.rubocop_todo/performance/string_identifier_argument.yml +++ b/.rubocop_todo/performance/string_identifier_argument.yml @@ -51,7 +51,6 @@ Performance/StringIdentifierArgument: - 'ee/app/services/incident_management/pending_escalations/process_service.rb' - 'ee/lib/gitlab/graphql/aggregations/issuables/lazy_links_aggregate.rb' - 'ee/spec/controllers/groups/iterations_controller_spec.rb' - - 'ee/spec/controllers/groups/security/policies_controller_spec.rb' - 'ee/spec/factories/protected_branches.rb' - 'ee/spec/graphql/mutations/groups/update_spec.rb' - 'ee/spec/helpers/push_rules_helper_spec.rb' diff --git a/.rubocop_todo/rails/strong_params.yml b/.rubocop_todo/rails/strong_params.yml index 382f9ead320..f90591869b3 100644 --- a/.rubocop_todo/rails/strong_params.yml +++ b/.rubocop_todo/rails/strong_params.yml @@ -229,7 +229,6 @@ Rails/StrongParams: - 'ee/app/controllers/ee/groups/group_members_controller.rb' - 'ee/app/controllers/ee/groups/milestones_controller.rb' - 'ee/app/controllers/ee/groups/work_items_controller.rb' - - 'ee/app/controllers/ee/groups_controller.rb' - 'ee/app/controllers/ee/import/github_controller.rb' - 'ee/app/controllers/ee/projects/application_controller.rb' - 'ee/app/controllers/ee/projects/cycle_analytics_controller.rb' diff --git a/.rubocop_todo/rspec/any_instance_of.yml b/.rubocop_todo/rspec/any_instance_of.yml index 5748c0603ce..ff26f041f24 100644 --- a/.rubocop_todo/rspec/any_instance_of.yml +++ b/.rubocop_todo/rspec/any_instance_of.yml @@ -173,7 +173,6 @@ RSpec/AnyInstanceOf: - 'spec/lib/gitlab/metrics/rack_middleware_spec.rb' - 'spec/lib/gitlab/metrics_spec.rb' - 'spec/lib/gitlab/sidekiq_daemon/monitor_spec.rb' - - 'spec/lib/gitlab/tracking/destinations/snowplow_spec.rb' - 'spec/lib/gitlab/tracking_spec.rb' - 'spec/lib/gitlab/usage_data_spec.rb' - 'spec/lib/gitlab/workhorse_spec.rb' diff --git a/.rubocop_todo/rspec/context_wording.yml b/.rubocop_todo/rspec/context_wording.yml index 37e000566bf..c01573433a4 100644 --- a/.rubocop_todo/rspec/context_wording.yml +++ b/.rubocop_todo/rspec/context_wording.yml @@ -243,7 +243,6 @@ RSpec/ContextWording: - 'ee/spec/helpers/ee/auth_helper_spec.rb' - 'ee/spec/helpers/ee/gitlab_routing_helper_spec.rb' - 'ee/spec/helpers/ee/groups/group_members_helper_spec.rb' - - 'ee/spec/helpers/ee/groups_helper_spec.rb' - 'ee/spec/helpers/ee/issuables_helper_spec.rb' - 'ee/spec/helpers/ee/issues_helper_spec.rb' - 'ee/spec/helpers/ee/lock_helper_spec.rb' diff --git a/.rubocop_todo/rspec/expect_change.yml b/.rubocop_todo/rspec/expect_change.yml index 27957e868b0..676670d40f9 100644 --- a/.rubocop_todo/rspec/expect_change.yml +++ b/.rubocop_todo/rspec/expect_change.yml @@ -155,7 +155,6 @@ RSpec/ExpectChange: - 'spec/controllers/admin/users_controller_spec.rb' - 'spec/controllers/groups/boards_controller_spec.rb' - 'spec/controllers/groups/group_links_controller_spec.rb' - - 'spec/controllers/groups_controller_spec.rb' - 'spec/controllers/import/bitbucket_controller_spec.rb' - 'spec/controllers/projects/boards_controller_spec.rb' - 'spec/controllers/projects/deploy_keys_controller_spec.rb' diff --git a/.rubocop_todo/rspec/factory_bot/avoid_create.yml b/.rubocop_todo/rspec/factory_bot/avoid_create.yml index c13ee58e6ce..fb0d6b7de9e 100644 --- a/.rubocop_todo/rspec/factory_bot/avoid_create.yml +++ b/.rubocop_todo/rspec/factory_bot/avoid_create.yml @@ -333,7 +333,6 @@ RSpec/FactoryBot/AvoidCreate: - 'spec/mailers/abuse_report_mailer_spec.rb' - 'spec/mailers/devise_mailer_spec.rb' - 'spec/mailers/emails/auto_devops_spec.rb' - - 'spec/mailers/emails/groups_spec.rb' - 'spec/mailers/emails/issues_spec.rb' - 'spec/mailers/emails/merge_requests_spec.rb' - 'spec/mailers/emails/pages_domains_spec.rb' diff --git a/.rubocop_todo/rspec/feature_category.yml b/.rubocop_todo/rspec/feature_category.yml index 84ef558225a..dbe56c9c080 100644 --- a/.rubocop_todo/rspec/feature_category.yml +++ b/.rubocop_todo/rspec/feature_category.yml @@ -68,7 +68,6 @@ RSpec/FeatureCategory: - 'ee/spec/frontend/fixtures/deployments.rb' - 'ee/spec/frontend/fixtures/dora/metrics.rb' - 'ee/spec/frontend/fixtures/epic.rb' - - 'ee/spec/frontend/fixtures/issues.rb' - 'ee/spec/frontend/fixtures/oncall_schedule.rb' - 'ee/spec/frontend/fixtures/project_quality_summary.rb' - 'ee/spec/frontend/fixtures/saml_providers.rb' @@ -1088,7 +1087,6 @@ RSpec/FeatureCategory: - 'spec/controllers/concerns/checks_collaboration_spec.rb' - 'spec/controllers/concerns/continue_params_spec.rb' - 'spec/controllers/concerns/controller_with_cross_project_access_check_spec.rb' - - 'spec/controllers/concerns/enforces_admin_authentication_spec.rb' - 'spec/controllers/concerns/graceful_timeout_handling_spec.rb' - 'spec/controllers/concerns/harbor/artifact_spec.rb' - 'spec/controllers/concerns/harbor/repository_spec.rb' @@ -1217,9 +1215,6 @@ RSpec/FeatureCategory: - 'spec/finders/ci/commit_statuses_finder_spec.rb' - 'spec/finders/ci/daily_build_group_report_results_finder_spec.rb' - 'spec/finders/ci/job_artifacts_finder_spec.rb' - - 'spec/finders/ci/pipeline_schedules_finder_spec.rb' - - 'spec/finders/ci/pipelines_finder_spec.rb' - - 'spec/finders/ci/pipelines_for_merge_request_finder_spec.rb' - 'spec/finders/ci/variables_finder_spec.rb' - 'spec/finders/cluster_ancestors_finder_spec.rb' - 'spec/finders/clusters/agent_tokens_finder_spec.rb' @@ -1309,7 +1304,6 @@ RSpec/FeatureCategory: - 'spec/frontend/fixtures/deploy_keys.rb' - 'spec/frontend/fixtures/freeze_period.rb' - 'spec/frontend/fixtures/integrations.rb' - - 'spec/frontend/fixtures/issues.rb' - 'spec/frontend/fixtures/job_artifacts.rb' - 'spec/frontend/fixtures/jobs.rb' - 'spec/frontend/fixtures/labels.rb' @@ -2378,7 +2372,6 @@ RSpec/FeatureCategory: - 'spec/lib/gitlab/diff/suggestions_parser_spec.rb' - 'spec/lib/gitlab/discussions_diff/file_collection_spec.rb' - 'spec/lib/gitlab/discussions_diff/highlight_cache_spec.rb' - - 'spec/lib/gitlab/doctor/secrets_spec.rb' - 'spec/lib/gitlab/doorkeeper_secret_storing/secret/pbkdf2_sha512_spec.rb' - 'spec/lib/gitlab/doorkeeper_secret_storing/token/pbkdf2_sha512_spec.rb' - 'spec/lib/gitlab/email/attachment_uploader_spec.rb' @@ -2460,7 +2453,6 @@ RSpec/FeatureCategory: - 'spec/lib/gitlab/git_access_wiki_spec.rb' - 'spec/lib/gitlab/git_post_receive_spec.rb' - 'spec/lib/gitlab/git_ref_validator_spec.rb' - - 'spec/lib/gitlab/git_spec.rb' - 'spec/lib/gitlab/gitaly_client/blob_service_spec.rb' - 'spec/lib/gitlab/gitaly_client/blobs_stitcher_spec.rb' - 'spec/lib/gitlab/gitaly_client/conflict_files_stitcher_spec.rb' @@ -3844,7 +3836,6 @@ RSpec/FeatureCategory: - 'spec/views/admin/application_settings/general.html.haml_spec.rb' - 'spec/views/admin/application_settings/repository.html.haml_spec.rb' - 'spec/views/admin/identities/index.html.haml_spec.rb' - - 'spec/views/admin/sessions/new.html.haml_spec.rb' - 'spec/views/ci/status/_icon.html.haml_spec.rb' - 'spec/views/dashboard/milestones/index.html.haml_spec.rb' - 'spec/views/dashboard/projects/_blank_state_admin_welcome.haml_spec.rb' diff --git a/.rubocop_todo/rspec/named_subject.yml b/.rubocop_todo/rspec/named_subject.yml index 1afe24e2e20..602d3e8bf4b 100644 --- a/.rubocop_todo/rspec/named_subject.yml +++ b/.rubocop_todo/rspec/named_subject.yml @@ -34,7 +34,6 @@ RSpec/NamedSubject: - 'ee/spec/controllers/groups/saml_providers_controller_spec.rb' - 'ee/spec/controllers/groups/scim_oauth_controller_spec.rb' - 'ee/spec/controllers/groups/security/merge_commit_reports_controller_spec.rb' - - 'ee/spec/controllers/groups/security/policies_controller_spec.rb' - 'ee/spec/controllers/passwords_controller_spec.rb' - 'ee/spec/controllers/projects/analytics/cycle_analytics/summary_controller_spec.rb' - 'ee/spec/controllers/projects/environments_controller_spec.rb' @@ -226,7 +225,6 @@ RSpec/NamedSubject: - 'ee/spec/lib/bulk_imports/groups/pipelines/epics_pipeline_spec.rb' - 'ee/spec/lib/bulk_imports/groups/pipelines/iterations_cadences_pipeline_spec.rb' - 'ee/spec/lib/bulk_imports/groups/pipelines/iterations_pipeline_spec.rb' - - 'ee/spec/lib/code_suggestions/prompts/code_completion/vertex_ai_spec.rb' - 'ee/spec/lib/ee/api/entities/dependency_list_export_spec.rb' - 'ee/spec/lib/ee/api/entities/deployment_extended_spec.rb' - 'ee/spec/lib/ee/api/entities/experiment_spec.rb' @@ -707,7 +705,6 @@ RSpec/NamedSubject: - 'ee/spec/requests/projects/analytics/cycle_analytics/stages_controller_spec.rb' - 'ee/spec/requests/projects/pipelines_controller_spec.rb' - 'ee/spec/requests/projects/requirements_management/requirements_controller_spec.rb' - - 'ee/spec/requests/projects/security/policies_controller_spec.rb' - 'ee/spec/requests/projects/security/scanned_resources_controller_spec.rb' - 'ee/spec/requests/projects/settings/analytics_controller_spec.rb' - 'ee/spec/requests/projects/tracing_controller_spec.rb' @@ -1238,7 +1235,6 @@ RSpec/NamedSubject: - 'spec/finders/ci/job_artifacts_finder_spec.rb' - 'spec/finders/ci/jobs_finder_spec.rb' - 'spec/finders/ci/pipeline_schedules_finder_spec.rb' - - 'spec/finders/ci/pipelines_finder_spec.rb' - 'spec/finders/ci/pipelines_for_merge_request_finder_spec.rb' - 'spec/finders/ci/runners_finder_spec.rb' - 'spec/finders/ci/triggers_finder_spec.rb' @@ -1899,7 +1895,6 @@ RSpec/NamedSubject: - 'spec/lib/gitlab/diff/suggestion_diff_spec.rb' - 'spec/lib/gitlab/diff/suggestions_parser_spec.rb' - 'spec/lib/gitlab/discussions_diff/file_collection_spec.rb' - - 'spec/lib/gitlab/doctor/secrets_spec.rb' - 'spec/lib/gitlab/email/handler/service_desk_handler_spec.rb' - 'spec/lib/gitlab/email/html_to_markdown_parser_spec.rb' - 'spec/lib/gitlab/encoding_helper_spec.rb' diff --git a/.rubocop_todo/rspec/receive_messages.yml b/.rubocop_todo/rspec/receive_messages.yml index 2254b32c516..3d3592b19b6 100644 --- a/.rubocop_todo/rspec/receive_messages.yml +++ b/.rubocop_todo/rspec/receive_messages.yml @@ -20,7 +20,6 @@ RSpec/ReceiveMessages: - 'ee/spec/helpers/billing_plans_helper_spec.rb' - 'ee/spec/helpers/ee/ci/pipeline_editor_helper_spec.rb' - 'ee/spec/helpers/ee/geo_helper_spec.rb' - - 'ee/spec/helpers/ee/groups_helper_spec.rb' - 'ee/spec/helpers/ee/ide_helper_spec.rb' - 'ee/spec/helpers/ee/issuables_helper_spec.rb' - 'ee/spec/helpers/ee/issues_helper_spec.rb' @@ -441,7 +440,6 @@ RSpec/ReceiveMessages: - 'spec/serializers/trigger_variable_entity_spec.rb' - 'spec/services/achievements/award_service_spec.rb' - 'spec/services/achievements/revoke_service_spec.rb' - - 'spec/services/auto_merge/base_service_spec.rb' - 'spec/services/auto_merge/merge_when_checks_pass_service_spec.rb' - 'spec/services/base_count_service_spec.rb' - 'spec/services/bulk_imports/create_service_spec.rb' diff --git a/.rubocop_todo/rspec/verified_doubles.yml b/.rubocop_todo/rspec/verified_doubles.yml index 26a3a5cb550..ea6c4d10c24 100644 --- a/.rubocop_todo/rspec/verified_doubles.yml +++ b/.rubocop_todo/rspec/verified_doubles.yml @@ -441,7 +441,6 @@ RSpec/VerifiedDoubles: - 'spec/lib/gitlab/diff/file_spec.rb' - 'spec/lib/gitlab/diff/line_spec.rb' - 'spec/lib/gitlab/diff/position_tracer_spec.rb' - - 'spec/lib/gitlab/doctor/secrets_spec.rb' - 'spec/lib/gitlab/email/receiver_spec.rb' - 'spec/lib/gitlab/email/service_desk_receiver_spec.rb' - 'spec/lib/gitlab/error_tracking/processor/sidekiq_processor_spec.rb' diff --git a/.rubocop_todo/style/format_string.yml b/.rubocop_todo/style/format_string.yml index 8cadd90336d..2d38d94298d 100644 --- a/.rubocop_todo/style/format_string.yml +++ b/.rubocop_todo/style/format_string.yml @@ -93,7 +93,6 @@ Style/FormatString: - 'ee/app/helpers/billing_plans_helper.rb' - 'ee/app/helpers/ee/application_helper.rb' - 'ee/app/helpers/ee/geo_helper.rb' - - 'ee/app/helpers/ee/groups_helper.rb' - 'ee/app/helpers/ee/import_helper.rb' - 'ee/app/helpers/ee/profiles_helper.rb' - 'ee/app/helpers/ee/timeboxes_helper.rb' diff --git a/.rubocop_todo/style/inline_disable_annotation.yml b/.rubocop_todo/style/inline_disable_annotation.yml index b682d998568..8c92c980842 100644 --- a/.rubocop_todo/style/inline_disable_annotation.yml +++ b/.rubocop_todo/style/inline_disable_annotation.yml @@ -2234,7 +2234,6 @@ Style/InlineDisableAnnotation: - 'spec/models/ci/build_trace_chunk_spec.rb' - 'spec/models/ci/job_token/project_scope_link_spec.rb' - 'spec/models/ci/persistent_ref_spec.rb' - - 'spec/models/ci/pipeline_spec.rb' - 'spec/models/concerns/bulk_insertable_associations_spec.rb' - 'spec/models/concerns/legacy_bulk_insert_spec.rb' - 'spec/models/concerns/manual_inverse_association_spec.rb' diff --git a/.rubocop_todo/style/super_arguments.yml b/.rubocop_todo/style/super_arguments.yml index 52b2003b865..084dfe4a7fd 100644 --- a/.rubocop_todo/style/super_arguments.yml +++ b/.rubocop_todo/style/super_arguments.yml @@ -129,7 +129,6 @@ Style/SuperArguments: - 'lib/banzai/pipeline/description_pipeline.rb' - 'lib/banzai/pipeline/email_pipeline.rb' - 'lib/banzai/pipeline/note_pipeline.rb' - - 'lib/banzai/pipeline/single_line_pipeline.rb' - 'lib/gitlab/analytics/cycle_analytics/request_params.rb' - 'lib/gitlab/asciidoc/html5_converter.rb' - 'lib/gitlab/bitbucket_server_import/importers/pull_request_notes/standalone_notes.rb' diff --git a/app/assets/javascripts/alerts_settings/components/alerts_integrations_list.vue b/app/assets/javascripts/alerts_settings/components/alerts_integrations_list.vue index f210ab0be01..b0aaca30649 100644 --- a/app/assets/javascripts/alerts_settings/components/alerts_integrations_list.vue +++ b/app/assets/javascripts/alerts_settings/components/alerts_integrations_list.vue @@ -18,7 +18,6 @@ import { integrationToDeleteDefault, typeSet, } from '../constants'; -import getCurrentIntegrationQuery from '../graphql/queries/get_current_integration.query.graphql'; export const i18n = { deleteIntegration: s__('AlertSettings|Delete integration'), @@ -102,15 +101,9 @@ export default { label: __('Actions'), }, ], - apollo: { - currentIntegration: { - query: getCurrentIntegrationQuery, - }, - }, data() { return { integrationToDelete: integrationToDeleteDefault, - currentIntegration: null, }; }, mounted() { diff --git a/app/assets/javascripts/vue_shared/components/ci_cd_analytics/ci_cd_analytics_area_chart.vue b/app/assets/javascripts/analytics/ci_cd/components/ci_cd_analytics_area_chart.vue similarity index 100% rename from app/assets/javascripts/vue_shared/components/ci_cd_analytics/ci_cd_analytics_area_chart.vue rename to app/assets/javascripts/analytics/ci_cd/components/ci_cd_analytics_area_chart.vue diff --git a/app/assets/javascripts/vue_shared/components/ci_cd_analytics/ci_cd_analytics_charts.vue b/app/assets/javascripts/analytics/ci_cd/components/ci_cd_analytics_charts.vue similarity index 100% rename from app/assets/javascripts/vue_shared/components/ci_cd_analytics/ci_cd_analytics_charts.vue rename to app/assets/javascripts/analytics/ci_cd/components/ci_cd_analytics_charts.vue diff --git a/app/assets/javascripts/vue_shared/components/ci_cd_analytics/constants.js b/app/assets/javascripts/analytics/ci_cd/components/constants.js similarity index 100% rename from app/assets/javascripts/vue_shared/components/ci_cd_analytics/constants.js rename to app/assets/javascripts/analytics/ci_cd/components/constants.js diff --git a/app/assets/javascripts/behaviors/shortcuts/keybindings.js b/app/assets/javascripts/behaviors/shortcuts/keybindings.js index 28624afecd3..3e48472f29a 100644 --- a/app/assets/javascripts/behaviors/shortcuts/keybindings.js +++ b/app/assets/javascripts/behaviors/shortcuts/keybindings.js @@ -564,7 +564,8 @@ export const SIDEBAR_CLOSE_WIDGET = { export const WORK_ITEM_TOGGLE_SIDEBAR = { id: 'workitems.toggleSidebar', description: __('Show or hide sidebar'), - defaultKeys: ['mod+/'], // eslint-disable-line @gitlab/require-i18n-strings + defaultKeys: ['mod+/', 'shift+mod+7'], // eslint-disable-line @gitlab/require-i18n-strings + // Shift+7 is equivalent to forward-slash on some keyboards without a dedicated key customizable: false, }; diff --git a/app/assets/javascripts/projects/pipelines/charts/components/pipelines_dashboard.vue b/app/assets/javascripts/projects/pipelines/charts/components/pipelines_dashboard.vue index 3f6c6529505..34ec38e2599 100644 --- a/app/assets/javascripts/projects/pipelines/charts/components/pipelines_dashboard.vue +++ b/app/assets/javascripts/projects/pipelines/charts/components/pipelines_dashboard.vue @@ -3,7 +3,7 @@ import { GlAlert, GlSkeletonLoader } from '@gitlab/ui'; import { GlColumnChart, GlChartSeriesLabel } from '@gitlab/ui/dist/charts'; import { getDateInPast, localeDateFormat } from '~/lib/utils/datetime_utility'; import { __, s__ } from '~/locale'; -import CiCdAnalyticsCharts from '~/vue_shared/components/ci_cd_analytics/ci_cd_analytics_charts.vue'; +import CiCdAnalyticsCharts from '~/analytics/ci_cd/components/ci_cd_analytics_charts.vue'; import { DEFAULT, CHART_CONTAINER_HEIGHT, diff --git a/app/assets/javascripts/super_sidebar/components/global_search/components/frequent_item.vue b/app/assets/javascripts/super_sidebar/components/global_search/components/frequent_item.vue index 2b1d49c7ccc..687fff44422 100644 --- a/app/assets/javascripts/super_sidebar/components/global_search/components/frequent_item.vue +++ b/app/assets/javascripts/super_sidebar/components/global_search/components/frequent_item.vue @@ -1,7 +1,7 @@ diff --git a/app/assets/javascripts/super_sidebar/components/global_search/components/frequent_items.vue b/app/assets/javascripts/super_sidebar/components/global_search/components/frequent_items.vue index 70ced1c19f5..19950f32915 100644 --- a/app/assets/javascripts/super_sidebar/components/global_search/components/frequent_items.vue +++ b/app/assets/javascripts/super_sidebar/components/global_search/components/frequent_items.vue @@ -6,7 +6,7 @@ import { TRACKING_UNKNOWN_PANEL } from '~/super_sidebar/constants'; import { TRACKING_CLICK_COMMAND_PALETTE_ITEM, OVERLAY_GOTO } from '../command_palette/constants'; import FrequentItem from './frequent_item.vue'; import FrequentItemSkeleton from './frequent_item_skeleton.vue'; -import SearchResultHoverLayover from './global_search_hover_overlay.vue'; +import SearchResultFocusLayover from './global_search_focus_overlay.vue'; export default { name: 'FrequentlyVisitedItems', @@ -19,7 +19,7 @@ export default { GlIcon, FrequentItem, FrequentItemSkeleton, - SearchResultHoverLayover, + SearchResultFocusLayover, }, props: { loading: { @@ -107,7 +107,7 @@ export default { v-for="item of formattedItems" :key="item.forDropdown.id" :item="item.forDropdown" - class="show-on-focus-or-hover--context show-hover-layover" + class="show-on-focus-or-hover--context show-focus-layover" @action="$emit('action')" > @@ -118,12 +118,12 @@ export default { {{ emptyStateText }} - + diff --git a/app/assets/javascripts/super_sidebar/components/global_search/components/global_search_autocomplete_items.vue b/app/assets/javascripts/super_sidebar/components/global_search/components/global_search_autocomplete_items.vue index f18ef928d86..eddebaa83f8 100644 --- a/app/assets/javascripts/super_sidebar/components/global_search/components/global_search_autocomplete_items.vue +++ b/app/assets/javascripts/super_sidebar/components/global_search/components/global_search_autocomplete_items.vue @@ -1,5 +1,11 @@ diff --git a/app/assets/javascripts/super_sidebar/components/global_search/components/global_search_default_places.vue b/app/assets/javascripts/super_sidebar/components/global_search/components/global_search_default_places.vue index 551b2a51f3e..e44da3a3ef1 100644 --- a/app/assets/javascripts/super_sidebar/components/global_search/components/global_search_default_places.vue +++ b/app/assets/javascripts/super_sidebar/components/global_search/components/global_search_default_places.vue @@ -1,5 +1,5 @@