From 99b0fc34b2a274fd44875c3c1e8a8a65ac0e331b Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 7 Apr 2025 15:14:18 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .eslint_todo/vue-no-unused-properties.mjs | 8 - .gitlab/CODEOWNERS | 3 + .../gitlab-com/danger-review.gitlab-ci.yml | 2 +- .../security.gitlab-ci.yml | 2 +- .gitlab/ci/test-on-cng/main.gitlab-ci.yml | 7 +- .gitlab/ci/test-on-gdk/main.gitlab-ci.yml | 4 + .../ci/test-on-omnibus/external.gitlab-ci.yml | 2 +- .../layout/first_hash_element_indentation.yml | 22 --- GITALY_SERVER_VERSION | 2 +- .../components/alert_management_table.vue | 3 - .../ci/reports/components/issues_list.vue | 6 +- .../crm/contacts/components/contacts_root.vue | 1 - .../components/organizations_root.vue | 1 - .../diffs/stores/legacy_diffs/actions.js | 4 +- .../graphql_shared/possible_types.json | 4 + .../incidents/components/incidents_list.vue | 3 - .../components/candidate_list_row.vue | 49 ------ .../components/details_page/tags_list.vue | 6 - .../components/details_page/tags_list_row.vue | 2 +- .../explorer/pages/details.vue | 1 - .../components/manifest_row.vue | 2 +- .../shared/package_list_row.vue | 2 +- .../markdown_drawer/markdown_drawer.vue | 5 +- .../components/mr_more_dropdown.vue | 1 - .../init_new_resource_dropdown.js | 1 - .../new_resource_dropdown.vue | 9 -- .../paginated_table_with_search_and_tabs.vue | 4 - .../components/registry/list_item.vue | 5 - .../components/smart_virtual_list.vue | 1 - .../upload_dropzone/upload_dropzone.vue | 3 - .../ci/runner_owner_project_resolver.rb | 2 +- app/graphql/types/ci/runner_type.rb | 2 +- app/graphql/types/project_type.rb | 11 +- .../types/projects/project_base_field.rb | 17 +++ .../types/projects/project_interface.rb | 55 +++++++ app/policies/project_policy.rb | 1 + .../groups/group_members/index.html.haml | 1 + .../projects/project_members/index.html.haml | 1 + config/sidekiq_queues.yml | 4 +- ...tch-ff-git-urls-without-tokens-default.yml | 48 ------ doc/administration/raketasks/check.md | 2 +- doc/api/graphql/reference/_index.md | 39 ++++- doc/api/user_tokens.md | 31 +++- doc/api/vulnerability_archive_exports.md | 141 ++++++++++++++++++ doc/ci/pipeline_editor/_index.md | 1 + doc/development/fe_guide/frontend_faq.md | 2 +- doc/topics/git/undo.md | 2 +- doc/update/deprecations.md | 31 ---- .../dependency_list/_index.md | 2 +- doc/user/group/saml_sso/group_sync.md | 33 ++-- doc/user/project/pages/_index.md | 7 + .../project/pages/parallel_deployments.md | 20 +++ locale/gitlab.pot | 4 +- scripts/frontend/quarantined_vue3_specs.txt | 1 - spec/frontend/crm/contacts_root_spec.js | 10 -- spec/frontend/crm/organizations_root_spec.js | 10 -- .../show/components/header_actions_spec.js | 14 +- .../components/candidate_list_row_spec.js | 39 ----- .../components/details_page/tags_list_spec.js | 5 +- .../explorer/pages/details_spec.js | 1 - .../shared/package_list_row_spec.js | 5 - .../markdown_drawer/markdown_drawer_spec.js | 10 +- .../new_resource_dropdown_spec.js | 79 ++++------ .../mocks/items.json | 15 -- ...ginated_table_with_search_and_tabs_spec.js | 9 +- spec/graphql/types/project_type_spec.rb | 2 + .../types/projects/project_base_field_spec.rb | 31 ++++ .../types/projects/project_interface_spec.rb | 25 ++++ .../authorizations_compactor_spec.rb | 3 +- ...istinct_count_by_large_foreign_key_spec.rb | 12 +- .../histogram_with_large_table_spec.rb | 4 +- .../instrumentation_superclass_spec.rb | 12 +- .../cop/usage_data/large_table_spec.rb | 20 +-- .../coverage_report_service_spec.rb | 10 +- spec/services/clusters/update_service_spec.rb | 12 +- spec/services/notes/render_service_spec.rb | 10 +- .../delete_tags_service_spec.rb | 8 +- .../create_from_template_service_spec.rb | 8 +- .../quick_actions/interpret_service_spec.rb | 30 ++-- .../submit_service_ping_service_spec.rb | 8 +- spec/sidekiq_cluster/sidekiq_cluster_spec.rb | 10 +- .../has_spam_action_response_fields_spec.rb | 10 +- spec/support/helpers/kubernetes_helpers.rb | 30 ++-- spec/support/helpers/wiki_helpers.rb | 2 +- .../client_shared_context.rb | 8 +- .../policies/project_policy_shared_context.rb | 2 +- .../artifacts_controller_shared_examples.rb | 14 +- ...repositories_controller_shared_examples.rb | 6 +- .../harbor/tags_controller_shared_examples.rb | 14 +- .../clusters/prometheus_client_shared.rb | 6 +- .../api/npm_packages_shared_examples.rb | 6 +- spec/tooling/ci/changed_files_spec.rb | 4 +- spec/views/layouts/_head.html.haml_spec.rb | 8 +- tooling/ci/changed_files.rb | 2 +- 94 files changed, 588 insertions(+), 549 deletions(-) delete mode 100644 app/assets/javascripts/ml/model_registry/components/candidate_list_row.vue create mode 100644 app/graphql/types/projects/project_base_field.rb create mode 100644 app/graphql/types/projects/project_interface.rb delete mode 100644 data/deprecations/18-0-runner-switch-ff-git-urls-without-tokens-default.yml create mode 100644 doc/api/vulnerability_archive_exports.md delete mode 100644 spec/frontend/ml/model_registry/components/candidate_list_row_spec.js delete mode 100644 spec/frontend/vue_shared/components/paginated_table_with_search_and_tabs/mocks/items.json create mode 100644 spec/graphql/types/projects/project_base_field_spec.rb create mode 100644 spec/graphql/types/projects/project_interface_spec.rb diff --git a/.eslint_todo/vue-no-unused-properties.mjs b/.eslint_todo/vue-no-unused-properties.mjs index a0fe940472f..45b29aab035 100644 --- a/.eslint_todo/vue-no-unused-properties.mjs +++ b/.eslint_todo/vue-no-unused-properties.mjs @@ -278,13 +278,6 @@ export default { 'app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue', 'app/assets/javascripts/vue_merge_request_widget/widgets/accessibility/index.vue', 'app/assets/javascripts/vue_merge_request_widget/widgets/code_quality/index.vue', - 'app/assets/javascripts/vue_shared/components/markdown_drawer/markdown_drawer.vue', - 'app/assets/javascripts/vue_shared/components/mr_more_dropdown.vue', - 'app/assets/javascripts/vue_shared/components/new_resource_dropdown/new_resource_dropdown.vue', - 'app/assets/javascripts/vue_shared/components/paginated_table_with_search_and_tabs/paginated_table_with_search_and_tabs.vue', - 'app/assets/javascripts/vue_shared/components/registry/list_item.vue', - 'app/assets/javascripts/vue_shared/components/smart_virtual_list.vue', - 'app/assets/javascripts/vue_shared/components/upload_dropzone/upload_dropzone.vue', 'app/assets/javascripts/webhooks/components/form_custom_header_item.vue', 'app/assets/javascripts/work_items/components/create_work_item.vue', 'app/assets/javascripts/work_items/components/design_management/design_notes/design_discussion.vue', @@ -489,7 +482,6 @@ export default { 'ee/app/assets/javascripts/usage_quotas/code_suggestions/components/search_and_sort_bar.vue', 'ee/app/assets/javascripts/usage_quotas/seats/components/statistics_seats_card.vue', 'ee/app/assets/javascripts/usage_quotas/transfer/components/usage_by_month.vue', - 'ee/app/assets/javascripts/users/identity_verification/components/credit_card_verification.vue', 'ee/app/assets/javascripts/vue_merge_request_widget/components/blocking_merge_requests/blocking_merge_request_body.vue', 'ee/app/assets/javascripts/vue_merge_request_widget/components/blocking_merge_requests/blocking_merge_requests_report.vue', 'ee/app/assets/javascripts/vue_merge_request_widget/components/checks/not_approved.vue', diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS index 6cfe758cbcd..841617080ff 100644 --- a/.gitlab/CODEOWNERS +++ b/.gitlab/CODEOWNERS @@ -1814,6 +1814,9 @@ ee/app/workers/ai/repository_xray/ /ee/lib/sidebars/ /ee/lib/ee/sidebars/ +^[Foundations::Design System] @gitlab-org/foundations/design-system/engineering +/app/components/pajamas/ + # Necessary for availability, similar to DB migrations [Global Search] @gitlab-org/search-team/migration-maintainers /ee/elastic/migrate/ diff --git a/.gitlab/ci/includes/gitlab-com/danger-review.gitlab-ci.yml b/.gitlab/ci/includes/gitlab-com/danger-review.gitlab-ci.yml index ac08d189af6..a5709c0a301 100644 --- a/.gitlab/ci/includes/gitlab-com/danger-review.gitlab-ci.yml +++ b/.gitlab/ci/includes/gitlab-com/danger-review.gitlab-ci.yml @@ -1,5 +1,5 @@ include: - - component: ${CI_SERVER_FQDN}/gitlab-org/components/danger-review/danger-review@2.0.0 + - component: ${CI_SERVER_FQDN}/gitlab-org/components/danger-review/danger-review@2.1.0 inputs: job_image: "${DEFAULT_CI_IMAGE}" job_stage: "preflight" diff --git a/.gitlab/ci/release-environments/security.gitlab-ci.yml b/.gitlab/ci/release-environments/security.gitlab-ci.yml index 890d6556d01..300bcfe88bd 100644 --- a/.gitlab/ci/release-environments/security.gitlab-ci.yml +++ b/.gitlab/ci/release-environments/security.gitlab-ci.yml @@ -6,7 +6,7 @@ include: inputs: cng_path: 'charts/components/images' - project: 'gitlab-org/quality/pipeline-common' - ref: '9.14.0' + ref: '10.0.0' file: ci/base.gitlab-ci.yml stages: diff --git a/.gitlab/ci/test-on-cng/main.gitlab-ci.yml b/.gitlab/ci/test-on-cng/main.gitlab-ci.yml index b0fa36dd5a6..29fbc69dbf6 100644 --- a/.gitlab/ci/test-on-cng/main.gitlab-ci.yml +++ b/.gitlab/ci/test-on-cng/main.gitlab-ci.yml @@ -36,8 +36,10 @@ workflow: - .e2e-test-base - .cng-qa-cache # cng-cache includes additional cached helm chart needs: - - build-cng-env - - build-cng + - job: build-cng-env + - job: build-cng + - pipeline: $PARENT_PIPELINE_ID + job: clone-gitlab-repo tags: - e2e variables: @@ -51,6 +53,7 @@ workflow: QA_RUN_IN_PARALLEL: "true" QA_PARALLEL_PROCESSES: 4 GITLAB_QA_ADMIN_ACCESS_TOKEN: $QA_ADMIN_ACCESS_TOKEN + GIT_STRATEGY: "none" before_script: - !reference [.qa-install, before_script] - !reference [.cng-deploy-cmd, script] diff --git a/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml b/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml index ad9c504d855..54d75fcdb3d 100644 --- a/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml +++ b/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml @@ -46,6 +46,9 @@ workflow: command: [gdk, tail, rails-web] tags: - e2e + needs: + - pipeline: $PARENT_PIPELINE_ID + job: clone-gitlab-repo variables: COVERBAND_ENABLED: "$COVERBAND_ENABLED" # explicitly define variable so it is passed in to gdk service container GITLAB_CRON_JOBS_POLL_INTERVAL: "0" @@ -57,6 +60,7 @@ workflow: QA_DOCKER_NETWORK: host QA_GITLAB_URL: http://gdk.test:3000 RSPEC_LAST_RUN_RESULTS_FILE: "$CI_PROJECT_DIR/qa/tmp/examples.txt" + GIT_STRATEGY: "none" after_script: - !reference [.with-gdk-log, after_script] - !reference [.gitlab-qa-report, after_script] diff --git a/.gitlab/ci/test-on-omnibus/external.gitlab-ci.yml b/.gitlab/ci/test-on-omnibus/external.gitlab-ci.yml index 7c115da4081..f1ae2b8f8f3 100644 --- a/.gitlab/ci/test-on-omnibus/external.gitlab-ci.yml +++ b/.gitlab/ci/test-on-omnibus/external.gitlab-ci.yml @@ -3,7 +3,7 @@ include: - project: gitlab-org/quality/pipeline-common - ref: 9.14.0 + ref: 10.0.0 file: - /ci/base.gitlab-ci.yml diff --git a/.rubocop_todo/layout/first_hash_element_indentation.yml b/.rubocop_todo/layout/first_hash_element_indentation.yml index 39a94aa66c9..18d6a7de7e9 100644 --- a/.rubocop_todo/layout/first_hash_element_indentation.yml +++ b/.rubocop_todo/layout/first_hash_element_indentation.yml @@ -22,25 +22,3 @@ Layout/FirstHashElementIndentation: - 'spec/requests/api/releases_spec.rb' - 'spec/requests/api/task_completion_status_spec.rb' - 'spec/requests/pwa_controller_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/services/ci/pipeline_artifacts/coverage_report_service_spec.rb' - - 'spec/services/clusters/update_service_spec.rb' - - 'spec/services/notes/render_service_spec.rb' - - 'spec/services/projects/container_repository/delete_tags_service_spec.rb' - - 'spec/services/projects/create_from_template_service_spec.rb' - - 'spec/services/quick_actions/interpret_service_spec.rb' - - 'spec/services/service_ping/submit_service_ping_service_spec.rb' - - 'spec/sidekiq_cluster/sidekiq_cluster_spec.rb' - - 'spec/spam/concerns/has_spam_action_response_fields_spec.rb' - - 'spec/support/helpers/kubernetes_helpers.rb' - - 'spec/support/helpers/wiki_helpers.rb' - - 'spec/support/shared_contexts/lib/container_registry/client_shared_context.rb' - - 'spec/support/shared_examples/harbor/artifacts_controller_shared_examples.rb' - - 'spec/support/shared_examples/harbor/repositories_controller_shared_examples.rb' - - 'spec/support/shared_examples/harbor/tags_controller_shared_examples.rb' - - 'spec/support/shared_examples/models/clusters/prometheus_client_shared.rb' - - 'spec/support/shared_examples/requests/api/npm_packages_shared_examples.rb' - - 'spec/views/layouts/_head.html.haml_spec.rb' diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 608d7aada8c..318c0830d43 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -7b808f014c602c9c308353cde9e2748a44aaf888 +14cc6838b1a5bf20345484f5cb1171a0aa8d1f49 diff --git a/app/assets/javascripts/alert_management/components/alert_management_table.vue b/app/assets/javascripts/alert_management/components/alert_management_table.vue index 606ef1a03c0..ec955ad59cc 100644 --- a/app/assets/javascripts/alert_management/components/alert_management_table.vue +++ b/app/assets/javascripts/alert_management/components/alert_management_table.vue @@ -291,9 +291,6 @@ export default { f.fileHash === fileHash)) { this[types.SET_CURRENT_DIFF_FILE](fileHash); } + + return Promise.resolve(); } export function navigateToDiffFileIndex(index) { diff --git a/app/assets/javascripts/graphql_shared/possible_types.json b/app/assets/javascripts/graphql_shared/possible_types.json index d272a6cefe2..ec9219b3f6f 100644 --- a/app/assets/javascripts/graphql_shared/possible_types.json +++ b/app/assets/javascripts/graphql_shared/possible_types.json @@ -171,6 +171,10 @@ "PendingGroupMember", "PendingProjectMember" ], + "ProjectInterface": [ + "Project", + "ProjectMinimalAccess" + ], "Registrable": [ "CiSecureFileRegistry", "ContainerRepositoryRegistry", diff --git a/app/assets/javascripts/incidents/components/incidents_list.vue b/app/assets/javascripts/incidents/components/incidents_list.vue index bff90e188a1..a7ebab4ad05 100644 --- a/app/assets/javascripts/incidents/components/incidents_list.vue +++ b/app/assets/javascripts/incidents/components/incidents_list.vue @@ -344,9 +344,6 @@ export default { :show-items="showList" :show-error-msg="showErrorMsg" :i18n="$options.i18n" - :items=" - incidents.list || [] /* eslint-disable-line @gitlab/vue-no-new-non-primitive-in-template */ - " :page-info="incidents.pageInfo" :items-count="incidentsCount" :status-tabs="$options.statusTabs" diff --git a/app/assets/javascripts/ml/model_registry/components/candidate_list_row.vue b/app/assets/javascripts/ml/model_registry/components/candidate_list_row.vue deleted file mode 100644 index bc129efa56d..00000000000 --- a/app/assets/javascripts/ml/model_registry/components/candidate_list_row.vue +++ /dev/null @@ -1,49 +0,0 @@ - - - diff --git a/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/tags_list.vue b/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/tags_list.vue index 8d6f78b1898..a6a32f79690 100644 --- a/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/tags_list.vue +++ b/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/tags_list.vue @@ -61,11 +61,6 @@ export default { default: true, required: false, }, - disabled: { - type: Boolean, - default: false, - required: false, - }, isImageLoading: { type: Boolean, default: false, @@ -265,7 +260,6 @@ export default { :first="first" :selected="isSelected(item)" :is-mobile="isMobile" - :disabled="disabled" @select="selectItem(item)" @delete="deleteTags([item])" /> diff --git a/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/tags_list_row.vue b/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/tags_list_row.vue index f4a0c1dac9a..3a8657c204f 100644 --- a/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/tags_list_row.vue +++ b/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/tags_list_row.vue @@ -180,7 +180,7 @@ export default {