From 9251853fdd488b5b62a36a80577e6f060a67be04 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 3 Feb 2025 21:09:43 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab/ci/frontend.gitlab-ci.yml | 4 +- .rubocop_todo/gettext/static_identifier.yml | 1 - .rubocop_todo/gitlab/bounded_contexts.yml | 3 - .rubocop_todo/layout/line_length.yml | 1 - GITLAB_KAS_VERSION | 2 +- Gemfile | 2 +- Gemfile.checksum | 4 +- Gemfile.lock | 8 +- Gemfile.next.checksum | 4 +- Gemfile.next.lock | 8 +- .../graphql_shared/possible_types.json | 4 +- .../projects/new_v2/components/app.vue | 58 +++++-- .../components/project_destination_select.vue | 15 +- .../javascripts/projects/new_v2/index.js | 8 +- .../components/blob_content_viewer.vue | 11 +- .../repository/mixins/highlight_mixin.js | 1 + .../command_palette/constants.js | 4 + .../components/global_search.vue | 75 ++++++--- .../todos/components/todo_item.vue | 2 +- .../todos/components/todos_app.vue | 2 +- .../todos/components/todos_pagination.vue | 4 +- .../allowlist_entry.fragment.graphql | 2 +- app/controllers/application_controller.rb | 21 --- .../concerns/sessionless_authentication.rb | 31 ++-- app/controllers/graphql_controller.rb | 34 +--- .../ci/job_token_accessible_project_type.rb | 41 +++++ .../types/ci/job_token_auth_log_type.rb | 2 +- .../types/ci/job_token_scope/target_type.rb | 4 +- app/graphql/types/ci/job_token_scope_type.rb | 2 +- .../concerns/integrations/base/confluence.rb | 89 ++++++++++ app/models/integrations/confluence.rb | 71 +------- .../integrations/instance/confluence.rb | 2 +- app/validators/json_schema_validator.rb | 4 - app/views/projects/new.html.haml | 5 +- ...=> ci_merge_request_variables_preload.yml} | 12 +- .../ops/graphql_minimal_auth_methods.yml | 9 - config/sidekiq_queues.yml | 2 + ...t_user_details_bot_namespace_migration.yml | 2 +- db/docs/board_assignees.yml | 6 +- .../requirements_management_test_reports.yml | 15 +- ...194127_add_board_assignees_sharding_key.rb | 10 ++ ...ot_user_details_bot_namespace_migration.rb | 23 +++ ...ackfill_sharding_key_on_board_assignees.rb | 33 ++++ ...00_add_board_assignees_project_id_index.rb | 16 ++ ...5500_add_board_assignees_group_id_index.rb | 16 ++ ...ignees_sharding_key_not_null_constraint.rb | 14 ++ ...3202635_add_board_assignees_group_id_fk.rb | 20 +++ ...02841_add_board_assignees_project_id_fk.rb | 20 +++ db/schema_migrations/20250121193138 | 1 + db/schema_migrations/20250123194127 | 1 + db/schema_migrations/20250123195300 | 1 + db/schema_migrations/20250123195400 | 1 + db/schema_migrations/20250123195500 | 1 + db/schema_migrations/20250123201951 | 1 + db/schema_migrations/20250123202635 | 1 + db/schema_migrations/20250123202841 | 1 + db/structure.sql | 15 +- doc/.vale/gitlab_base/Substitutions.yml | 4 +- doc/administration/admin_area.md | 2 +- .../supported_llm_serving_platforms.md | 15 +- ...ported_models_and_hardware_requirements.md | 55 ++++++- doc/api/alert_management_alerts.md | 2 +- doc/api/dora/metrics.md | 2 +- doc/api/get_started/get_started_extending.md | 2 +- doc/api/graphql/assign_gitlab_duo_seats.md | 2 +- doc/api/graphql/audit_report.md | 2 +- doc/api/graphql/branch_rules.md | 2 +- doc/api/graphql/custom_emoji.md | 2 +- .../epic_work_items_api_migration_guide.md | 8 +- doc/api/graphql/getting_started.md | 2 +- doc/api/graphql/index.md | 11 +- .../graphql/reference/{index.md => _index.md} | 47 +++++- doc/api/graphql/sample_issue_boards.md | 2 +- doc/api/graphql/users_example.md | 2 +- doc/api/group_import_export.md | 2 +- doc/api/group_service_accounts.md | 2 +- doc/api/groups.md | 12 +- doc/api/member_roles.md | 2 +- doc/api/merge_request_approvals.md | 2 +- doc/api/project_vulnerabilities.md | 2 +- doc/api/rest/authentication.md | 2 +- doc/api/rest/index.md | 2 +- doc/api/runners.md | 16 +- doc/api/settings.md | 36 ++-- doc/api/vulnerabilities.md | 12 +- doc/api/vulnerability_findings.md | 6 +- doc/ci/components/index.md | 2 +- doc/ci/jobs/ci_job_token.md | 4 +- doc/development/api_graphql_styleguide.md | 4 +- .../documentation/graphql_styleguide.md | 2 +- .../site_architecture/automation.md | 2 +- .../documentation/testing/index.md | 2 +- doc/development/fe_guide/graphql.md | 2 +- doc/development/graphql_guide/monitoring.md | 2 +- doc/development/rake_tasks.md | 2 +- doc/development/work_items_widgets.md | 2 +- doc/editor_extensions/jetbrains_ide/setup.md | 2 +- doc/editor_extensions/neovim/setup.md | 2 +- doc/integration/arkose.md | 2 +- doc/integration/clickhouse.md | 2 +- doc/integration/gitpod.md | 4 +- doc/integration/jenkins.md | 2 +- doc/integration/jira/connect-app.md | 2 +- doc/integration/jira/troubleshooting.md | 2 +- doc/integration/saml.md | 6 +- doc/integration/sourcegraph.md | 4 +- doc/operations/feature_flags.md | 8 +- doc/operations/incident_management/slack.md | 2 +- doc/security/user_file_uploads.md | 2 +- doc/update/versions/gitlab_15_changes.md | 2 +- doc/user/analytics/ai_impact_analytics.md | 2 +- doc/user/analytics/dora_metrics.md | 2 +- doc/user/analytics/value_streams_dashboard.md | 2 +- .../configuration/index.md | 2 +- .../security_dashboard/index.md | 2 +- doc/user/crm/index.md | 14 +- doc/user/custom_roles.md | 8 +- doc/user/gitlab_duo/turn_on_off.md | 2 +- doc/user/group/compliance_frameworks.md | 2 +- .../group/contribution_analytics/index.md | 2 +- doc/user/group/epics/epic_work_items.md | 2 +- doc/user/group/moderate_users.md | 2 +- doc/user/group/saml_sso/troubleshooting.md | 2 +- .../infrastructure/iac/terraform_state.md | 2 +- doc/user/markdown.md | 2 +- .../reduce_dependency_proxy_storage.md | 2 +- doc/user/packages/maven_repository/index.md | 2 +- doc/user/packages/nuget_repository/index.md | 4 +- .../terraform_module_registry/index.md | 2 +- doc/user/profile/achievements.md | 18 +- doc/user/project/quick_actions.md | 1 + doc/user/project/time_tracking.md | 16 +- doc/user/project/use_project_as_go_package.md | 2 +- doc/user/workspace/index.md | 4 +- lefthook.yml | 8 +- lib/gitlab/auth/request_authenticator.rb | 8 +- lib/gitlab/ci/variables/builder/pipeline.rb | 4 + .../ci/variables/preloader/merge_request.rb | 30 ++++ lib/tasks/gitlab/graphql.rake | 2 +- locale/gitlab.pot | 21 +++ .../frontend/check_jest_vue3_quarantine.js | 8 +- .../projects/new_v2/components/app_spec.js | 45 ++++- .../components/blob_content_viewer_spec.js | 47 +++--- spec/frontend/repository/mock_data.js | 2 + .../components/global_search_spec.js | 66 ++++++-- .../job_token_accessible_project_type_spec.rb | 13 ++ .../types/ci/job_token_auth_log_type_spec.rb | 22 ++- .../ci/job_token_scope/target_type_spec.rb | 4 +- .../types/ci/job_token_scope_type_spec.rb | 12 +- ...ll_sharding_key_on_board_assignees_spec.rb | 52 ++++++ spec/models/integrations/confluence_spec.rb | 86 +--------- .../integrations/instance/confluence_spec.rb | 7 + .../job_token_scope/allowlist_query_spec.rb | 2 +- .../add_group_or_project_spec.rb | 2 +- .../ci/job_token_scope/add_project_spec.rb | 2 +- .../ci/job_token_scope/remove_project_spec.rb | 2 +- .../update_job_token_policies_spec.rb | 2 +- spec/requests/api/graphql_spec.rb | 154 ------------------ .../base/confluence_shared_examples.rb | 89 ++++++++++ spec/tooling/danger/project_helper_spec.rb | 2 +- spec/tooling/graphql/docs/renderer_spec.rb | 87 ++++++---- tooling/graphql/docs/helper.rb | 1 + tooling/graphql/docs/renderer.rb | 2 +- .../graphql/docs/templates/default.md.haml | 2 - 164 files changed, 1176 insertions(+), 781 deletions(-) create mode 100644 app/graphql/types/ci/job_token_accessible_project_type.rb create mode 100644 app/models/concerns/integrations/base/confluence.rb rename config/feature_flags/gitlab_com_derisk/{fix_graphql_csrf.yml => ci_merge_request_variables_preload.yml} (66%) delete mode 100644 config/feature_flags/ops/graphql_minimal_auth_methods.yml create mode 100644 db/migrate/20250123194127_add_board_assignees_sharding_key.rb create mode 100644 db/post_migrate/20250121193138_finalize_project_bot_user_details_bot_namespace_migration.rb create mode 100644 db/post_migrate/20250123195300_backfill_sharding_key_on_board_assignees.rb create mode 100644 db/post_migrate/20250123195400_add_board_assignees_project_id_index.rb create mode 100644 db/post_migrate/20250123195500_add_board_assignees_group_id_index.rb create mode 100644 db/post_migrate/20250123201951_add_board_assignees_sharding_key_not_null_constraint.rb create mode 100644 db/post_migrate/20250123202635_add_board_assignees_group_id_fk.rb create mode 100644 db/post_migrate/20250123202841_add_board_assignees_project_id_fk.rb create mode 100644 db/schema_migrations/20250121193138 create mode 100644 db/schema_migrations/20250123194127 create mode 100644 db/schema_migrations/20250123195300 create mode 100644 db/schema_migrations/20250123195400 create mode 100644 db/schema_migrations/20250123195500 create mode 100644 db/schema_migrations/20250123201951 create mode 100644 db/schema_migrations/20250123202635 create mode 100644 db/schema_migrations/20250123202841 rename doc/api/graphql/reference/{index.md => _index.md} (99%) create mode 100644 lib/gitlab/ci/variables/preloader/merge_request.rb create mode 100644 spec/graphql/types/ci/job_token_accessible_project_type_spec.rb create mode 100644 spec/migrations/20250123195300_backfill_sharding_key_on_board_assignees_spec.rb create mode 100644 spec/models/integrations/instance/confluence_spec.rb create mode 100644 spec/support/shared_examples/models/concerns/integrations/base/confluence_shared_examples.rb diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml index 85085509e46..199808ddf50 100644 --- a/.gitlab/ci/frontend.gitlab-ci.yml +++ b/.gitlab/ci/frontend.gitlab-ci.yml @@ -443,19 +443,19 @@ jest vue3 check quarantined predictive: - "detect-tests" script: - if [[ -s "$RSPEC_CHANGED_FILES_PATH" ]] || [[ -s "$RSPEC_MATCHING_JS_FILES_PATH" ]]; then run_timed_command "./scripts/frontend/check_jest_vue3_quarantine.js"; fi - parallel: 1 + parallel: 4 artifacts: name: quarantined_tests_output expire_in: 31d when: always paths: - - tmp/tests/frontend/jest_stdout - tmp/tests/frontend/jest_stderr - tmp/tests/frontend/jest_results.json jest-with-fixtures vue3 check quarantined predictive: extends: - jest vue3 check quarantined predictive + parallel: 1 variables: JEST_FIXTURE_JOBS_ONLY: 1 diff --git a/.rubocop_todo/gettext/static_identifier.yml b/.rubocop_todo/gettext/static_identifier.yml index 3a5c43c78df..7ba845d3118 100644 --- a/.rubocop_todo/gettext/static_identifier.yml +++ b/.rubocop_todo/gettext/static_identifier.yml @@ -2,7 +2,6 @@ Gettext/StaticIdentifier: Exclude: - 'app/graphql/types/project_type.rb' - - 'app/models/integrations/confluence.rb' - 'app/services/import/fogbugz_service.rb' - 'app/services/issues/set_crm_contacts_service.rb' - 'app/services/projects/create_from_template_service.rb' diff --git a/.rubocop_todo/gitlab/bounded_contexts.yml b/.rubocop_todo/gitlab/bounded_contexts.yml index 9b1f404a785..0e227a6fcbe 100644 --- a/.rubocop_todo/gitlab/bounded_contexts.yml +++ b/.rubocop_todo/gitlab/bounded_contexts.yml @@ -3081,9 +3081,6 @@ Gitlab/BoundedContexts: - 'ee/app/services/dashboard/projects/create_service.rb' - 'ee/app/services/dashboard/projects/list_service.rb' - 'ee/app/services/dependencies/create_export_service.rb' - - 'ee/app/services/dependencies/export_serializers/group_dependencies_service.rb' - - 'ee/app/services/dependencies/export_serializers/organization_dependencies_service.rb' - - 'ee/app/services/dependencies/export_serializers/project_dependencies_service.rb' - 'ee/app/services/dependencies/export_serializers/sbom/pipeline_service.rb' - 'ee/app/services/dependencies/export_service.rb' - 'ee/app/services/deployments/approval_service.rb' diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml index 89323556471..5ca780ab5b3 100644 --- a/.rubocop_todo/layout/line_length.yml +++ b/.rubocop_todo/layout/line_length.yml @@ -125,7 +125,6 @@ Layout/LineLength: - 'app/models/integrations/chat_message/note_message.rb' - 'app/models/integrations/chat_message/pipeline_message.rb' - 'app/models/integrations/chat_message/wiki_page_message.rb' - - 'app/models/integrations/confluence.rb' - 'app/models/integrations/datadog.rb' - 'app/models/integrations/discord.rb' - 'app/models/integrations/drone_ci.rb' diff --git a/GITLAB_KAS_VERSION b/GITLAB_KAS_VERSION index 80c4807200a..1eaec0f2abc 100644 --- a/GITLAB_KAS_VERSION +++ b/GITLAB_KAS_VERSION @@ -1 +1 @@ -bb5dd9c7ced8de9cf7f5405a34836e6fb7f8e8a4 +c7429ee9944f2d6eaa868a67209049abe04252e2 diff --git a/Gemfile b/Gemfile index df18ac259b0..60837bbd2a0 100644 --- a/Gemfile +++ b/Gemfile @@ -182,7 +182,7 @@ gem 'gitlab-duo-workflow-service-client', '~> 0.1', feature_category: :duo_workflow # Generate Fake data -gem 'ffaker', '~> 2.23', feature_category: :shared +gem 'ffaker', '~> 2.24', feature_category: :shared gem 'hashie', '~> 5.0.0', feature_category: :shared diff --git a/Gemfile.checksum b/Gemfile.checksum index c636da278ec..d662efb9638 100644 --- a/Gemfile.checksum +++ b/Gemfile.checksum @@ -175,7 +175,7 @@ {"name":"fast_blank","version":"1.0.1","platform":"java","checksum":"90d82106b0e4aa19ac24ba1604c79a0c5a4c471601e800c9b2b072938a6d9a92"}, {"name":"fast_blank","version":"1.0.1","platform":"ruby","checksum":"269fc30414fed4e6403bc4a49081e1ea539f8b9226e59276ed1efaefabaa17ea"}, {"name":"fast_gettext","version":"2.3.0","platform":"ruby","checksum":"0253e26423ccab68061c42387827e3b99243a1b15ad614df1c800ba870d64f84"}, -{"name":"ffaker","version":"2.23.0","platform":"ruby","checksum":"9d2dfb5cc284a92c8571bddcbe0c573127a2f3238f4b0aa56e08ccf3e4858498"}, +{"name":"ffaker","version":"2.24.0","platform":"ruby","checksum":"43e3f8c12d602fbc70398be8bd1ac841a031eabdc12af01507e76a8d675a5d52"}, {"name":"ffi","version":"1.17.1","platform":"aarch64-linux-gnu","checksum":"c5d22cb545a3a691d46060f1343c461d1a8d38c3fd71b96b4cbbe6906bf1fd38"}, {"name":"ffi","version":"1.17.1","platform":"aarch64-linux-musl","checksum":"88b9d6ae905d21142df27c94bb300042c1aae41b67291885f600eaad16326b1d"}, {"name":"ffi","version":"1.17.1","platform":"arm-linux-gnu","checksum":"fe14f5ece94082f3b0e651a09008113281f2764e7ea95f522b64e2fe32e11504"}, @@ -536,7 +536,7 @@ {"name":"pry","version":"0.14.2","platform":"java","checksum":"fd780670977ba04ff7ee32dabd4d02fe4bf02e977afe8809832d5dca1412862e"}, {"name":"pry","version":"0.14.2","platform":"ruby","checksum":"c4fe54efedaca1d351280b45b8849af363184696fcac1c72e0415f9bdac4334d"}, {"name":"pry-byebug","version":"3.10.1","platform":"ruby","checksum":"c8f975c32255bfdb29e151f5532130be64ff3d0042dc858d0907e849125581f8"}, -{"name":"pry-rails","version":"0.3.9","platform":"ruby","checksum":"468662575abb6b67f4a9831219f99290d5eae7bf186e64dd810d0a3e4a8cc4b1"}, +{"name":"pry-rails","version":"0.3.11","platform":"ruby","checksum":"a69e28e24a34d75d1f60bcf241192a54253f8f7ef8a62cba1e75750a9653593d"}, {"name":"pry-shell","version":"0.6.4","platform":"ruby","checksum":"ad024882d29912b071a7de65ebea538b242d2dc1498c60c7c2352ef94769f208"}, {"name":"public_suffix","version":"6.0.1","platform":"ruby","checksum":"61d44e1cab5cbbbe5b31068481cf16976dd0dc1b6b07bd95617ef8c5e3e00c6f"}, {"name":"puma","version":"6.5.0","platform":"java","checksum":"a58eea585d291aa33796add9884208bc1591da5d8e61886f8ac74d080b298c40"}, diff --git a/Gemfile.lock b/Gemfile.lock index 4de7979c451..cea50b86c19 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -628,7 +628,7 @@ GEM faraday (>= 2.0, < 3) fast_blank (1.0.1) fast_gettext (2.3.0) - ffaker (2.23.0) + ffaker (2.24.0) ffi (1.17.1) ffi-compiler (1.0.1) ffi (>= 1.0.0) @@ -1469,8 +1469,8 @@ GEM pry-byebug (3.10.1) byebug (~> 11.0) pry (>= 0.13, < 0.15) - pry-rails (0.3.9) - pry (>= 0.10.4) + pry-rails (0.3.11) + pry (>= 0.13.0) pry-shell (0.6.4) pry (>= 0.13.0) tty-markdown @@ -2070,7 +2070,7 @@ DEPENDENCIES faraday-typhoeus (~> 1.1) faraday_middleware-aws-sigv4 (~> 1.0.1) fast_blank (~> 1.0.1) - ffaker (~> 2.23) + ffaker (~> 2.24) ffi (~> 1.17) flipper (~> 0.26.2) flipper-active_record (~> 0.26.2) diff --git a/Gemfile.next.checksum b/Gemfile.next.checksum index f3bc7fdab7d..011bfa801b8 100644 --- a/Gemfile.next.checksum +++ b/Gemfile.next.checksum @@ -175,7 +175,7 @@ {"name":"fast_blank","version":"1.0.1","platform":"java","checksum":"90d82106b0e4aa19ac24ba1604c79a0c5a4c471601e800c9b2b072938a6d9a92"}, {"name":"fast_blank","version":"1.0.1","platform":"ruby","checksum":"269fc30414fed4e6403bc4a49081e1ea539f8b9226e59276ed1efaefabaa17ea"}, {"name":"fast_gettext","version":"2.3.0","platform":"ruby","checksum":"0253e26423ccab68061c42387827e3b99243a1b15ad614df1c800ba870d64f84"}, -{"name":"ffaker","version":"2.23.0","platform":"ruby","checksum":"9d2dfb5cc284a92c8571bddcbe0c573127a2f3238f4b0aa56e08ccf3e4858498"}, +{"name":"ffaker","version":"2.24.0","platform":"ruby","checksum":"43e3f8c12d602fbc70398be8bd1ac841a031eabdc12af01507e76a8d675a5d52"}, {"name":"ffi","version":"1.17.1","platform":"aarch64-linux-gnu","checksum":"c5d22cb545a3a691d46060f1343c461d1a8d38c3fd71b96b4cbbe6906bf1fd38"}, {"name":"ffi","version":"1.17.1","platform":"aarch64-linux-musl","checksum":"88b9d6ae905d21142df27c94bb300042c1aae41b67291885f600eaad16326b1d"}, {"name":"ffi","version":"1.17.1","platform":"arm-linux-gnu","checksum":"fe14f5ece94082f3b0e651a09008113281f2764e7ea95f522b64e2fe32e11504"}, @@ -541,7 +541,7 @@ {"name":"pry","version":"0.14.2","platform":"java","checksum":"fd780670977ba04ff7ee32dabd4d02fe4bf02e977afe8809832d5dca1412862e"}, {"name":"pry","version":"0.14.2","platform":"ruby","checksum":"c4fe54efedaca1d351280b45b8849af363184696fcac1c72e0415f9bdac4334d"}, {"name":"pry-byebug","version":"3.10.1","platform":"ruby","checksum":"c8f975c32255bfdb29e151f5532130be64ff3d0042dc858d0907e849125581f8"}, -{"name":"pry-rails","version":"0.3.9","platform":"ruby","checksum":"468662575abb6b67f4a9831219f99290d5eae7bf186e64dd810d0a3e4a8cc4b1"}, +{"name":"pry-rails","version":"0.3.11","platform":"ruby","checksum":"a69e28e24a34d75d1f60bcf241192a54253f8f7ef8a62cba1e75750a9653593d"}, {"name":"pry-shell","version":"0.6.4","platform":"ruby","checksum":"ad024882d29912b071a7de65ebea538b242d2dc1498c60c7c2352ef94769f208"}, {"name":"psych","version":"5.2.3","platform":"java","checksum":"3e5425b9e8a2f41cc2707d5ef14fdc1ae908abbafb12fe45727bd63900056585"}, {"name":"psych","version":"5.2.3","platform":"ruby","checksum":"84a54bb952d14604fea22d99938348814678782f58b12648fcdfa4d2fce859ee"}, diff --git a/Gemfile.next.lock b/Gemfile.next.lock index 8c1a5379b08..f0cd86d44d7 100644 --- a/Gemfile.next.lock +++ b/Gemfile.next.lock @@ -640,7 +640,7 @@ GEM faraday (>= 2.0, < 3) fast_blank (1.0.1) fast_gettext (2.3.0) - ffaker (2.23.0) + ffaker (2.24.0) ffi (1.17.1) ffi-compiler (1.0.1) ffi (>= 1.0.0) @@ -1489,8 +1489,8 @@ GEM pry-byebug (3.10.1) byebug (~> 11.0) pry (>= 0.13, < 0.15) - pry-rails (0.3.9) - pry (>= 0.10.4) + pry-rails (0.3.11) + pry (>= 0.13.0) pry-shell (0.6.4) pry (>= 0.13.0) tty-markdown @@ -2105,7 +2105,7 @@ DEPENDENCIES faraday-typhoeus (~> 1.1) faraday_middleware-aws-sigv4 (~> 1.0.1) fast_blank (~> 1.0.1) - ffaker (~> 2.23) + ffaker (~> 2.24) ffi (~> 1.17) flipper (~> 0.26.2) flipper-active_record (~> 0.26.2) diff --git a/app/assets/javascripts/graphql_shared/possible_types.json b/app/assets/javascripts/graphql_shared/possible_types.json index 8e8b7980277..8b889bb5a4c 100644 --- a/app/assets/javascripts/graphql_shared/possible_types.json +++ b/app/assets/javascripts/graphql_shared/possible_types.json @@ -28,8 +28,8 @@ "Note" ], "CiJobTokenScopeTarget": [ - "Group", - "Project" + "CiJobTokenAccessibleProject", + "Group" ], "CiRunnerCloudProvisioning": [ "CiRunnerGkeProvisioning", diff --git a/app/assets/javascripts/projects/new_v2/components/app.vue b/app/assets/javascripts/projects/new_v2/components/app.vue index d198166a733..91b3551c237 100644 --- a/app/assets/javascripts/projects/new_v2/components/app.vue +++ b/app/assets/javascripts/projects/new_v2/components/app.vue @@ -1,6 +1,6 @@