From 8dbfb388b6afd5a47c86afe5aa2bca83dfd3aa7f Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 11 Jun 2025 18:09:50 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab/ci/frontend.gitlab-ci.yml | 18 + .gitlab/ci/rules.gitlab-ci.yml | 7 + .../gitlab/rspec/misplaced_ee_spec_file.yml | 1 - .../pipeline_failed_jobs_widget.vue | 2 +- .../graphql_shared/possible_types.json | 5 - ..._single_line.cjs => ensure_single_line.js} | 4 +- app/assets/javascripts/locale/index.js | 2 +- app/assets/stylesheets/framework/card.scss | 6 +- .../repositories/lfs_storage_controller.rb | 4 +- app/finders/issues/confidentiality_filter.rb | 19 +- app/graphql/types/namespace_type.rb | 7 - .../namespaces/user_level_permissions.rb | 44 --- ...p_namespace_user_level_permissions_type.rb | 24 -- ...t_namespace_user_level_permissions_type.rb | 20 -- ...r_namespace_user_level_permissions_type.rb | 14 - .../types/permission_types/namespaces/base.rb | 2 +- app/graphql/types/sort_enum.rb | 4 - ...marize_merge_request_claude_3_7_sonnet.yml | 9 - ...ptimization_for_confidentiality_filter.yml | 10 - ..._bulk_import_export_batches_project_id.yml | 2 +- ...on_for_enterprise_to_namespace_settings.rb | 10 + ...report_results_on_build_id_partition_id.rb | 25 ++ ..._report_results_to_include_partition_id.rb | 27 ++ ...l_bulk_import_export_batches_project_id.rb | 20 ++ db/schema_migrations/20250506035156 | 1 + db/schema_migrations/20250609181410 | 1 + db/schema_migrations/20250609181528 | 1 + db/schema_migrations/20250610152411 | 1 + db/structure.sql | 5 +- doc/administration/dedicated/maintenance.md | 15 +- doc/api/graphql/reference/_index.md | 55 +-- doc/api/groups.md | 333 ++++++++++++++++++ doc/editor_extensions/gitlab_cli/_index.md | 7 + locale/gitlab.pot | 14 +- package.json | 15 +- scripts/frontend/extract_gettext_all.js | 12 +- scripts/frontend/quarantined_vue3_specs.txt | 1 - .../merge_request_pipeline_spec.rb | 10 + .../clusters/agents/components/show_spec.js | 45 ++- .../locale/ensure_single_line_spec.js | 2 +- ...espace_user_level_permissions_type_spec.rb | 107 ------ ...espace_user_level_permissions_type_spec.rb | 85 ----- ...espace_user_level_permissions_type_spec.rb | 7 - .../namespaces/user_level_permissions_spec.rb | 39 -- .../permission_types/namespaces/base_spec.rb | 2 +- .../user_permissions_shared_examples.rb | 23 -- vite.config.js | 12 +- yarn.lock | 155 +------- 48 files changed, 566 insertions(+), 668 deletions(-) rename app/assets/javascripts/locale/{ensure_single_line.cjs => ensure_single_line.js} (89%) delete mode 100644 app/graphql/types/namespaces/user_level_permissions.rb delete mode 100644 app/graphql/types/namespaces/user_level_permissions/group_namespace_user_level_permissions_type.rb delete mode 100644 app/graphql/types/namespaces/user_level_permissions/project_namespace_user_level_permissions_type.rb delete mode 100644 app/graphql/types/namespaces/user_level_permissions/user_namespace_user_level_permissions_type.rb delete mode 100644 config/feature_flags/beta/summarize_merge_request_claude_3_7_sonnet.yml delete mode 100644 config/feature_flags/gitlab_com_derisk/use_cte_optimization_for_confidentiality_filter.yml create mode 100644 db/migrate/20250506035156_add_allow_bypass_placeholder_confirmation_for_enterprise_to_namespace_settings.rb create mode 100644 db/post_migrate/20250609181410_change_idx_ci_build_report_results_on_build_id_partition_id.rb create mode 100644 db/post_migrate/20250609181528_swap_primary_key_for_ci_build_report_results_to_include_partition_id.rb create mode 100644 db/post_migrate/20250610152411_finalize_backfill_bulk_import_export_batches_project_id.rb create mode 100644 db/schema_migrations/20250506035156 create mode 100644 db/schema_migrations/20250609181410 create mode 100644 db/schema_migrations/20250609181528 create mode 100644 db/schema_migrations/20250610152411 delete mode 100644 spec/graphql/types/namespaces/user_level_permissions/group_namespace_user_level_permissions_type_spec.rb delete mode 100644 spec/graphql/types/namespaces/user_level_permissions/project_namespace_user_level_permissions_type_spec.rb delete mode 100644 spec/graphql/types/namespaces/user_level_permissions/user_namespace_user_level_permissions_type_spec.rb delete mode 100644 spec/graphql/types/namespaces/user_level_permissions_spec.rb delete mode 100644 spec/support/shared_examples/graphql/types/namespaces/user_permissions_shared_examples.rb diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml index 68dadb9c01b..56d3942e5c6 100644 --- a/.gitlab/ci/frontend.gitlab-ci.yml +++ b/.gitlab/ci/frontend.gitlab-ci.yml @@ -83,6 +83,24 @@ compile-test-assets: - "${WEBPACK_COMPILE_LOG_PATH}" when: always +build-vite-prod: + extends: + - .production + - .default-retry + - .with-ci-node-image + - .frontend:rules:compile-production-assets + artifacts: + expire_in: 1h + paths: + - public/vite-dev/ + stage: prepare + needs: [] + script: + - source scripts/utils.sh + - yarn_install_script + - yarn vite-prod + allow_failure: true + gdk:compile-test-assets: extends: - compile-test-assets diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 1f77553826f..853b792c320 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -376,6 +376,7 @@ - "{package.json,yarn.lock}" - ".browserslistrc" - "babel.config.js" + - "vite.config.js" - "config/webpack.config.js" - "config/**/*.js" - "{,ee/,jh/}app/assets/**/*" @@ -388,6 +389,7 @@ - "{Gemfile.next,Gemfile.next.lock}" - ".browserslistrc" - "babel.config.js" + - "vite.config.js" - "config/webpack.config.js" - "*.js" - "config/**/*.js" @@ -544,6 +546,7 @@ - "*_VERSION" - "lib/gitlab/redis/*" - "babel.config.js" + - "vite.config.js" - "config.ru" - "Dockerfile.assets" - "jest.config.{base,integration,unit}.js" @@ -574,6 +577,7 @@ - "{package.json,yarn.lock}" - "*_VERSION" - "babel.config.js" + - "vite.config.js" - "config.ru" - "Dockerfile.assets" - "jest.config.{base,integration,unit}.js" @@ -611,6 +615,7 @@ - "{package.json,yarn.lock}" - "*_VERSION" - "babel.config.js" + - "vite.config.js" - "config.ru" - "Dockerfile.assets" - "jest.config.{base,integration,unit}.js" @@ -648,6 +653,7 @@ - "{package.json,yarn.lock}" - "*_VERSION" - "babel.config.js" + - "vite.config.js" - "config.ru" - "Dockerfile.assets" - "jest.config.{base,integration,unit}.js" @@ -686,6 +692,7 @@ - "{package.json,yarn.lock}" - ".browserslistrc" - "babel.config.js" + - "vite.config.js" - "jest.config.{base,integration,unit}.js" - ".stylelintrc" - "Dockerfile.assets" diff --git a/.rubocop_todo/gitlab/rspec/misplaced_ee_spec_file.yml b/.rubocop_todo/gitlab/rspec/misplaced_ee_spec_file.yml index 09c791261cf..0e47e79d730 100644 --- a/.rubocop_todo/gitlab/rspec/misplaced_ee_spec_file.yml +++ b/.rubocop_todo/gitlab/rspec/misplaced_ee_spec_file.yml @@ -65,7 +65,6 @@ Gitlab/RSpec/MisplacedEeSpecFile: - 'ee/spec/graphql/types/gitlab_subscriptions/member_management/users_queued_for_role_promotion_type_spec.rb' - 'ee/spec/graphql/types/issue_connection_type_spec.rb' - 'ee/spec/graphql/types/issue_type_spec.rb' - - 'ee/spec/graphql/types/namespaces/user_level_permissions/group_namespace_user_level_permissions_type_spec.rb' - 'ee/spec/graphql/types/permission_types/group_spec.rb' - 'ee/spec/graphql/types/permission_types/namespaces/base_spec.rb' - 'ee/spec/graphql/types/permission_types/project_spec.rb' diff --git a/app/assets/javascripts/ci/pipelines_page/components/failure_widget/pipeline_failed_jobs_widget.vue b/app/assets/javascripts/ci/pipelines_page/components/failure_widget/pipeline_failed_jobs_widget.vue index b5097997939..e649ff3889c 100644 --- a/app/assets/javascripts/ci/pipelines_page/components/failure_widget/pipeline_failed_jobs_widget.vue +++ b/app/assets/javascripts/ci/pipelines_page/components/failure_widget/pipeline_failed_jobs_widget.vue @@ -130,7 +130,7 @@ export default {