From 77ae95a49e9021f3e1f0c37430589874bbfee6bb Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 10 Jan 2025 15:30:13 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab/ci/global.gitlab-ci.yml | 3 +- .gitlab/ci/rules.gitlab-ci.yml | 2 +- .../boards/components/board_card.vue | 14 +- .../boards/components/board_card_inner.vue | 1 - .../components/commit_changes_modal.vue | 11 +- .../components/header_area/breadcrumbs.vue | 2 +- .../components/new_directory_modal.vue | 142 +++++----------- .../javascripts/repository/constants.js | 8 - .../components/sectioned_percentage_bar.vue | 10 +- .../list/components/issuable_item.vue | 6 + .../components/create_work_item.vue | 41 ++++- .../shared/work_item_link_child_contents.vue | 5 + .../components/work_item_drawer.vue | 14 +- .../components/work_item_parent.vue | 37 +++- .../graphql/group_work_items.query.graphql | 10 ++ .../work_items/graphql/resolvers.js | 7 + app/graphql/types/work_item_type.rb | 13 +- app/models/namespace/detail.rb | 2 - app/models/pages_deployment.rb | 10 +- app/presenters/work_item_presenter.rb | 25 ++- config/click_house.yml.example | 4 +- config/coverband.rb | 2 +- .../ops/workhorse_use_aws_sdk_v2.yml | 9 - .../wip/merge_request_dashboard_new_lists.yml | 2 +- ...l_vulnerability_issue_links_project_id.yml | 2 +- .../delete_orphaned_groups.yml | 4 +- ...45_queue_requeue_delete_orphaned_groups.rb | 18 +- ...ll_vulnerability_issue_links_project_id.rb | 21 +++ ...add_sharding_key_id_index_to_ci_runners.rb | 17 ++ ...ding_key_id_index_to_ci_runner_machines.rb | 17 ++ ...queue_re_enqueue_delete_orphaned_groups.rb | 31 ++++ db/schema_migrations/20250103122704 | 1 + db/schema_migrations/20250103133119 | 1 + db/schema_migrations/20250103134008 | 1 + db/schema_migrations/20250109105904 | 1 + db/structure.sql | 4 + doc/administration/settings/scim_setup.md | 139 ++++++++++++++- doc/api/graphql/reference/index.md | 3 + .../clickhouse/clickhouse_within_gitlab.md | 1 + .../python_guide/getting_started.md | 119 +++++++++++++ doc/install/install_ai_gateway.md | 23 +-- doc/subscriptions/subscription-add-ons.md | 2 - .../policies/pipeline_execution_policies.md | 10 +- .../img/devops_adoption_v17_8.png | Bin 0 -> 65507 bytes doc/user/group/devops_adoption/index.md | 23 +-- doc/user/group/ssh_certificates.md | 72 +++++++- doc/user/project/quick_actions.md | 1 + lib/object_storage/direct_upload.rb | 2 +- locale/gitlab.pot | 11 +- qa/qa/page/group/runners/index.rb | 4 + qa/qa/page/project/settings/runners.rb | 4 + qa/qa/resource/runner_base.rb | 10 ++ qa/qa/resource/user_runners.rb | 10 ++ qa/qa/service/docker_run/gitlab_runner.rb | 17 ++ .../deprecated_unregister_runner_spec.rb | 37 ++++ .../4_verify/runner/unregister_runner_spec.rb | 40 +++++ .../service/docker_run/gitlab_runner_spec.rb | 25 +++ spec/db/schema_spec.rb | 2 +- .../files/user_creates_directory_spec.rb | 40 +++-- .../work_items/create_issue_work_item_spec.rb | 1 + .../boards/components/board_card_spec.js | 10 +- .../components/new_directory_modal_spec.js | 154 ++++++----------- .../sectioned_percentage_bar_spec.js | 85 ++++++++++ .../list/components/issuable_item_spec.js | 22 +++ .../components/create_work_item_spec.js | 7 + .../work_item_link_child_contents_spec.js | 9 + .../components/work_item_drawer_spec.js | 24 ++- spec/graphql/types/work_item_type_spec.rb | 4 +- spec/lib/object_storage/direct_upload_spec.rb | 10 -- ...eue_requeue_delete_orphaned_groups_spec.rb | 38 +---- ..._re_enqueue_delete_orphaned_groups_spec.rb | 49 ++++++ spec/presenters/work_item_presenter_spec.rb | 70 +++++++- workhorse/go.mod | 2 +- workhorse/internal/config/config.go | 2 +- .../upload/destination/destination.go | 21 +-- .../upload/destination/destination_test.go | 6 +- .../destination/objectstore/s3_client_test.go | 3 +- .../destination/objectstore/s3_object.go | 125 -------------- .../destination/objectstore/s3_object_test.go | 159 ------------------ .../destination/objectstore/s3_session.go | 104 ------------ .../objectstore/s3_session_test.go | 100 ----------- .../destination/objectstore/s3v2_object.go | 9 +- .../objectstore/s3v2_object_test.go | 39 ++--- .../destination/objectstore/test/s3_stub.go | 82 +++++---- 84 files changed, 1271 insertions(+), 957 deletions(-) delete mode 100644 config/feature_flags/ops/workhorse_use_aws_sdk_v2.yml create mode 100644 db/post_migrate/20250103122704_finalize_backfill_vulnerability_issue_links_project_id.rb create mode 100644 db/post_migrate/20250103133119_add_sharding_key_id_index_to_ci_runners.rb create mode 100644 db/post_migrate/20250103134008_add_sharding_key_id_index_to_ci_runner_machines.rb create mode 100644 db/post_migrate/20250109105904_queue_re_enqueue_delete_orphaned_groups.rb create mode 100644 db/schema_migrations/20250103122704 create mode 100644 db/schema_migrations/20250103133119 create mode 100644 db/schema_migrations/20250103134008 create mode 100644 db/schema_migrations/20250109105904 create mode 100644 doc/development/python_guide/getting_started.md create mode 100644 doc/user/group/devops_adoption/img/devops_adoption_v17_8.png create mode 100644 qa/qa/specs/features/browser_ui/4_verify/runner/deprecated_unregister_runner_spec.rb create mode 100644 qa/qa/specs/features/browser_ui/4_verify/runner/unregister_runner_spec.rb create mode 100644 spec/migrations/20250109105904_queue_re_enqueue_delete_orphaned_groups_spec.rb delete mode 100644 workhorse/internal/upload/destination/objectstore/s3_object.go delete mode 100644 workhorse/internal/upload/destination/objectstore/s3_object_test.go delete mode 100644 workhorse/internal/upload/destination/objectstore/s3_session.go delete mode 100644 workhorse/internal/upload/destination/objectstore/s3_session_test.go diff --git a/.gitlab/ci/global.gitlab-ci.yml b/.gitlab/ci/global.gitlab-ci.yml index 85ccc58923e..33b544ad8fd 100644 --- a/.gitlab/ci/global.gitlab-ci.yml +++ b/.gitlab/ci/global.gitlab-ci.yml @@ -532,8 +532,7 @@ - name: clickhouse/clickhouse-server:23.11.3.23-alpine alias: clickhouse variables: - CLICKHOUSE_USER: clickhouse - CLICKHOUSE_PASSWORD: clickhouse + CLICKHOUSE_USER: default CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT: 1 CLICKHOUSE_DB: gitlab_clickhouse_test diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 42d78649cfd..ab82a1b31aa 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -2001,7 +2001,7 @@ when: never - <<: *if-merge-request-targeting-stable-branch when: never - - <<: *if-default-refs + - <<: *if-not-merge-request when: never - !reference [".rails:rules:ee-and-foss-migration", rules] diff --git a/app/assets/javascripts/boards/components/board_card.vue b/app/assets/javascripts/boards/components/board_card.vue index 29a81a80d5f..5a6d5714e8c 100644 --- a/app/assets/javascripts/boards/components/board_card.vue +++ b/app/assets/javascripts/boards/components/board_card.vue @@ -1,5 +1,6 @@ diff --git a/app/assets/javascripts/repository/constants.js b/app/assets/javascripts/repository/constants.js index 003cf3a5475..4aa9de465e3 100644 --- a/app/assets/javascripts/repository/constants.js +++ b/app/assets/javascripts/repository/constants.js @@ -6,14 +6,6 @@ export const TREE_PAGE_SIZE = 100; // the amount of items to be fetched per (bat export const COMMIT_BATCH_SIZE = 25; // we request commit data in batches of 25 -export const SECONDARY_OPTIONS_TEXT = __('Cancel'); -export const COMMIT_LABEL = __('Commit message'); -export const TARGET_BRANCH_LABEL = __('Target branch'); -export const TOGGLE_CREATE_MR_LABEL = __('Create a merge request for this change'); -export const NEW_BRANCH_IN_FORK = __( - 'GitLab will create a branch in your fork and start a merge request.', -); - export const COMMIT_MESSAGE_SUBJECT_MAX_LENGTH = 52; export const COMMIT_MESSAGE_BODY_MAX_LENGTH = 72; diff --git a/app/assets/javascripts/usage_quotas/components/sectioned_percentage_bar.vue b/app/assets/javascripts/usage_quotas/components/sectioned_percentage_bar.vue index c61adb3cc23..1d4bf214825 100644 --- a/app/assets/javascripts/usage_quotas/components/sectioned_percentage_bar.vue +++ b/app/assets/javascripts/usage_quotas/components/sectioned_percentage_bar.vue @@ -11,6 +11,8 @@ export default { * label: string; * value: number; * formattedValue: number | string; + * color: string; + * hideLabel: boolean, * }[] */ sections: { @@ -27,10 +29,9 @@ export default { computedSections() { return this.sections.map((section, index) => { const percentage = section.value / this.sectionsCombinedValue; - return { ...section, - backgroundColor: colorFromDefaultPalette(index), + backgroundColor: section.color ?? colorFromDefaultPalette(index), cssPercentage: `${roundOffFloat(percentage * 100, 4)}%`, srLabelPercentage: formatNumber(percentage, { style: 'percent', @@ -39,6 +40,9 @@ export default { }; }); }, + sectionLabels() { + return this.computedSections.filter((s) => !s.hideLabel); + }, }, }; @@ -62,7 +66,7 @@ export default {