From 22d47e2001387c59045fe413d227fd7c76cc19bb Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 6 Jun 2025 15:08:03 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .eslint_todo/vue-no-unused-properties.mjs | 1 - .../gitlab/feature_available_usage.yml | 1 - .rubocop_todo/layout/line_length.yml | 2 - .rubocop_todo/lint/unused_method_argument.yml | 1 - .../rails/helper_instance_variable.yml | 1 - .rubocop_todo/rspec/context_wording.yml | 1 - .../rspec/factory_bot/avoid_create.yml | 2 - .rubocop_todo/rspec/feature_category.yml | 2 - .rubocop_todo/rspec/named_subject.yml | 1 - .rubocop_todo/rspec/receive_messages.yml | 2 - .rubocop_todo/rspec/subject_declaration.yml | 1 - GITALY_SERVER_VERSION | 2 +- GITLAB_KAS_VERSION | 2 +- .../components/review_drawer.vue | 2 +- .../pipeline_inputs/pipeline_inputs_form.vue | 7 ++- .../components/editor/ci_editor_header.vue | 21 ++++++- .../components/pipeline_new_form.vue | 1 + .../components/sticky_header.vue | 10 +-- .../notes/components/discussion_counter.vue | 8 +-- .../javascripts/pages/projects/show/index.js | 7 +-- .../repository/components/header_area.vue | 2 +- app/assets/javascripts/repository/index.js | 7 +-- .../javascripts/sidebar/mount_sidebar.js | 2 +- .../components/mr_more_dropdown.vue | 32 +++------- .../components/create_work_item.vue | 16 ++--- .../work_items/graphql/cache_utils.js | 2 +- .../work_items/graphql/resolvers.js | 2 +- .../work_items/pages/work_items_list_app.vue | 7 ++- app/assets/javascripts/work_items/utils.js | 14 ++++- .../page_bundles/merge_request.scss | 5 -- .../page_bundles/merge_requests.scss | 2 - .../dashboard/projects_controller.rb | 2 +- .../groups/work_items_controller.rb | 11 +--- app/controllers/groups_controller.rb | 1 - app/controllers/projects/blob_controller.rb | 1 - app/controllers/projects/tree_controller.rb | 1 - .../projects/work_items_controller.rb | 1 - app/controllers/projects_controller.rb | 1 - app/controllers/root_controller.rb | 6 +- app/graphql/types/group_type.rb | 6 +- app/graphql/types/namespace_type.rb | 3 +- app/helpers/preferences_helper.rb | 5 +- app/models/group.rb | 5 -- app/models/group_label.rb | 2 +- app/models/merge_request.rb | 3 +- app/models/oauth_access_token.rb | 3 +- app/models/project_label.rb | 2 +- app/models/user.rb | 3 +- app/services/groups/autocomplete_service.rb | 12 +--- app/services/milestones/transfer_service.rb | 2 +- .../_account_and_limit.html.haml | 2 +- app/views/projects/_readme.html.haml | 29 ++++----- app/views/projects/_tree_content.html.haml | 6 +- app/views/projects/blob/_blob.html.haml | 5 +- app/views/projects/buttons/_compare.html.haml | 8 --- ...close_reopen_draft_report_toggle.html.haml | 15 ----- .../merge_requests/_code_dropdown.html.haml | 2 +- .../merge_requests/_mr_title.html.haml | 41 +++++++----- .../projects/merge_requests/_page.html.haml | 14 ++--- .../projects/tree/_tree_header.html.haml | 21 ------- app/views/root/index.html.haml | 1 + .../transform_references_worker.rb | 2 +- .../beta/blob_repository_vue_header_app.yml | 9 --- .../namespace_level_work_items.yml | 8 --- .../feature_flags/wip/personal_homepage.yml | 10 +++ ..._index_to_labels_for_type_project_id_id.rb | 19 ++++++ ...557_remove_previous_label_project_index.rb | 19 ++++++ db/schema_migrations/20250602123456 | 1 + db/schema_migrations/20250602184557 | 1 + db/structure.sql | 2 +- doc/api/graphql/reference/_index.md | 18 ++++-- doc/ci/pipeline_editor/_index.md | 11 ++++ doc/development/duo_workflow/_index.md | 10 +++ .../vulnerability_report/_index.md | 2 +- doc/user/gitlab_duo/data_usage.md | 2 +- doc/user/gitlab_duo/gateway.md | 2 +- doc/user/gitlab_duo/prompt_guardrails.md | 2 +- doc/user/profile/_index.md | 2 +- lib/gitlab/error_tracking/error_collection.rb | 2 +- lib/tasks/gitlab/cleanup.rake | 5 +- locale/gitlab.pot | 21 +++++++ scripts/verify-tff-mapping | 2 +- spec/controllers/root_controller_spec.rb | 54 ++++++++++++++-- .../close_reopen_report_toggle_spec.rb | 4 +- .../user_marks_merge_request_as_draft_spec.rb | 2 +- .../user_views_open_merge_request_spec.rb | 4 +- .../files/file_open_mrs_dropdown_spec.rb | 6 +- .../pipeline_inputs_form_spec.js | 16 +++++ .../editor/ci_editor_header_spec.js | 11 ++++ .../components/pipeline_new_form_spec.js | 1 + .../repository/components/header_area_spec.js | 11 +++- .../work_items/graphql/cache_utils_spec.js | 36 ++++++----- spec/frontend/work_items/utils_spec.js | 32 ++++++++-- .../user_work_items_resolver_spec.rb | 1 - spec/helpers/preferences_helper_spec.rb | 10 +++ .../mutations/work_items/create_spec.rb | 8 --- .../groups/work_items_controller_spec.rb | 7 ++- spec/spec_helper.rb | 3 + spec/support/rspec_order_todo.yml | 1 - .../projects/tree/show.html.haml_spec.rb | 62 ------------------- 100 files changed, 431 insertions(+), 368 deletions(-) delete mode 100644 app/views/projects/buttons/_compare.html.haml delete mode 100644 app/views/projects/merge_requests/_close_reopen_draft_report_toggle.html.haml delete mode 100644 app/views/projects/tree/_tree_header.html.haml create mode 100644 app/views/root/index.html.haml delete mode 100644 config/feature_flags/beta/blob_repository_vue_header_app.yml delete mode 100644 config/feature_flags/development/namespace_level_work_items.yml create mode 100644 config/feature_flags/wip/personal_homepage.yml create mode 100644 db/post_migrate/20250602123456_add_index_to_labels_for_type_project_id_id.rb create mode 100644 db/post_migrate/20250602184557_remove_previous_label_project_index.rb create mode 100644 db/schema_migrations/20250602123456 create mode 100644 db/schema_migrations/20250602184557 delete mode 100644 spec/views/projects/tree/show.html.haml_spec.rb diff --git a/.eslint_todo/vue-no-unused-properties.mjs b/.eslint_todo/vue-no-unused-properties.mjs index 9fc8573b900..f1ef2e04495 100644 --- a/.eslint_todo/vue-no-unused-properties.mjs +++ b/.eslint_todo/vue-no-unused-properties.mjs @@ -286,7 +286,6 @@ export default { 'ee/app/assets/javascripts/iterations/components/iteration_form.vue', 'ee/app/assets/javascripts/iterations/components/iteration_report.vue', 'ee/app/assets/javascripts/merge_requests/components/reviewers/approval_summary.vue', - 'ee/app/assets/javascripts/notes/components/ai_summary.vue', 'ee/app/assets/javascripts/oncall_schedules/components/add_edit_schedule_form.vue', 'ee/app/assets/javascripts/oncall_schedules/components/oncall_schedule.vue', 'ee/app/assets/javascripts/oncall_schedules/components/rotations/components/rotation_assignee.vue', diff --git a/.rubocop_todo/gitlab/feature_available_usage.yml b/.rubocop_todo/gitlab/feature_available_usage.yml index 3885eb6e1b4..bfddf567ad1 100644 --- a/.rubocop_todo/gitlab/feature_available_usage.yml +++ b/.rubocop_todo/gitlab/feature_available_usage.yml @@ -26,7 +26,6 @@ Gitlab/FeatureAvailableUsage: - 'ee/app/helpers/ee/form_helper.rb' - 'ee/app/helpers/ee/graph_helper.rb' - 'ee/app/helpers/ee/issues_helper.rb' - - 'ee/app/helpers/ee/lock_helper.rb' - 'ee/app/helpers/ee/operations_helper.rb' - 'ee/app/helpers/ee/projects/incidents_helper.rb' - 'ee/app/helpers/ee/projects_helper.rb' diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml index 46902010cae..12324cb95fa 100644 --- a/.rubocop_todo/layout/line_length.yml +++ b/.rubocop_todo/layout/line_length.yml @@ -521,7 +521,6 @@ Layout/LineLength: - 'ee/app/helpers/ee/integrations_helper.rb' - 'ee/app/helpers/ee/issues_helper.rb' - 'ee/app/helpers/ee/labels_helper.rb' - - 'ee/app/helpers/ee/lock_helper.rb' - 'ee/app/helpers/ee/merge_requests_helper.rb' - 'ee/app/helpers/ee/mirror_helper.rb' - 'ee/app/helpers/ee/notes_helper.rb' @@ -4127,7 +4126,6 @@ Layout/LineLength: - 'spec/views/projects/settings/ci_cd/_autodevops_form.html.haml_spec.rb' - 'spec/views/projects/settings/operations/show.html.haml_spec.rb' - 'spec/views/projects/tags/index.html.haml_spec.rb' - - 'spec/views/projects/tree/show.html.haml_spec.rb' - 'spec/views/shared/milestones/_issuable.html.haml_spec.rb' - 'spec/views/shared/projects/_project.html.haml_spec.rb' - 'spec/views/shared/snippets/_snippet.html.haml_spec.rb' diff --git a/.rubocop_todo/lint/unused_method_argument.yml b/.rubocop_todo/lint/unused_method_argument.yml index 520b8a245f9..2c4f839b8a5 100644 --- a/.rubocop_todo/lint/unused_method_argument.yml +++ b/.rubocop_todo/lint/unused_method_argument.yml @@ -198,7 +198,6 @@ Lint/UnusedMethodArgument: - 'ee/app/graphql/types/security_orchestration/security_policy_source_type.rb' - 'ee/app/graphql/types/vulnerability_detail_type.rb' - 'ee/app/graphql/types/vulnerability_location_type.rb' - - 'ee/app/helpers/ee/lock_helper.rb' - 'ee/app/models/boards/epic_board.rb' - 'ee/app/models/burndown.rb' - 'ee/app/models/concerns/elastic/application_versioned_search.rb' diff --git a/.rubocop_todo/rails/helper_instance_variable.yml b/.rubocop_todo/rails/helper_instance_variable.yml index 84a3f273415..225e5e11e0a 100644 --- a/.rubocop_todo/rails/helper_instance_variable.yml +++ b/.rubocop_todo/rails/helper_instance_variable.yml @@ -58,7 +58,6 @@ Rails/HelperInstanceVariable: - 'ee/app/helpers/ee/integrations_helper.rb' - 'ee/app/helpers/ee/kerberos_helper.rb' - 'ee/app/helpers/ee/labels_helper.rb' - - 'ee/app/helpers/ee/lock_helper.rb' - 'ee/app/helpers/ee/mirror_helper.rb' - 'ee/app/helpers/ee/notes_helper.rb' - 'ee/app/helpers/ee/operations_helper.rb' diff --git a/.rubocop_todo/rspec/context_wording.yml b/.rubocop_todo/rspec/context_wording.yml index b29d3d67bf9..26601b53655 100644 --- a/.rubocop_todo/rspec/context_wording.yml +++ b/.rubocop_todo/rspec/context_wording.yml @@ -241,7 +241,6 @@ RSpec/ContextWording: - 'ee/spec/helpers/ee/groups/group_members_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' - 'ee/spec/helpers/ee/operations_helper_spec.rb' - 'ee/spec/helpers/ee/personal_access_tokens_helper_spec.rb' - 'ee/spec/helpers/ee/projects/security/api_fuzzing_configuration_helper_spec.rb' diff --git a/.rubocop_todo/rspec/factory_bot/avoid_create.yml b/.rubocop_todo/rspec/factory_bot/avoid_create.yml index 94a2cf79ca3..5fb5954fe67 100644 --- a/.rubocop_todo/rspec/factory_bot/avoid_create.yml +++ b/.rubocop_todo/rspec/factory_bot/avoid_create.yml @@ -31,7 +31,6 @@ RSpec/FactoryBot/AvoidCreate: - 'ee/spec/helpers/ee/issuables_helper_spec.rb' - 'ee/spec/helpers/ee/issues_helper_spec.rb' - 'ee/spec/helpers/ee/labels_helper_spec.rb' - - 'ee/spec/helpers/ee/lock_helper_spec.rb' - 'ee/spec/helpers/ee/namespaces_helper_spec.rb' - 'ee/spec/helpers/ee/operations_helper_spec.rb' - 'ee/spec/helpers/ee/projects/pipeline_helper_spec.rb' @@ -579,7 +578,6 @@ RSpec/FactoryBot/AvoidCreate: - 'spec/views/projects/settings/merge_requests/show.html.haml_spec.rb' - 'spec/views/projects/settings/operations/show.html.haml_spec.rb' - 'spec/views/projects/tags/index.html.haml_spec.rb' - - 'spec/views/projects/tree/show.html.haml_spec.rb' - 'spec/views/search/_results.html.haml_spec.rb' - 'spec/views/shared/_label_row.html.haml_spec.rb' - 'spec/views/shared/issuable/_sidebar.html.haml_spec.rb' diff --git a/.rubocop_todo/rspec/feature_category.yml b/.rubocop_todo/rspec/feature_category.yml index 413923b22c1..f5de8f51b5d 100644 --- a/.rubocop_todo/rspec/feature_category.yml +++ b/.rubocop_todo/rspec/feature_category.yml @@ -350,7 +350,6 @@ RSpec/FeatureCategory: - 'ee/spec/helpers/ee/groups/settings_helper_spec.rb' - 'ee/spec/helpers/ee/hooks_helper_spec.rb' - 'ee/spec/helpers/ee/labels_helper_spec.rb' - - 'ee/spec/helpers/ee/lock_helper_spec.rb' - 'ee/spec/helpers/ee/operations_helper_spec.rb' - 'ee/spec/helpers/ee/profiles_helper_spec.rb' - 'ee/spec/helpers/ee/projects/incidents_helper_spec.rb' @@ -3847,7 +3846,6 @@ RSpec/FeatureCategory: - 'spec/views/projects/settings/integrations/edit.html.haml_spec.rb' - 'spec/views/projects/settings/operations/show.html.haml_spec.rb' - 'spec/views/projects/tags/index.html.haml_spec.rb' - - 'spec/views/projects/tree/show.html.haml_spec.rb' - 'spec/views/shared/_label_row.html.haml_spec.rb' - 'spec/views/shared/_milestones_sort_dropdown.html.haml_spec.rb' - 'spec/views/shared/gitlab_version/_security_patch_upgrade_alert.html.haml_spec.rb' diff --git a/.rubocop_todo/rspec/named_subject.yml b/.rubocop_todo/rspec/named_subject.yml index a89f73a999e..c3b51fa5b67 100644 --- a/.rubocop_todo/rspec/named_subject.yml +++ b/.rubocop_todo/rspec/named_subject.yml @@ -180,7 +180,6 @@ RSpec/NamedSubject: - '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/lock_helper_spec.rb' - 'ee/spec/helpers/ee/merge_requests_helper_spec.rb' - 'ee/spec/helpers/ee/operations_helper_spec.rb' - 'ee/spec/helpers/ee/projects/incidents_helper_spec.rb' diff --git a/.rubocop_todo/rspec/receive_messages.yml b/.rubocop_todo/rspec/receive_messages.yml index 377a1ca9fda..351cefd7c5e 100644 --- a/.rubocop_todo/rspec/receive_messages.yml +++ b/.rubocop_todo/rspec/receive_messages.yml @@ -23,7 +23,6 @@ RSpec/ReceiveMessages: - 'ee/spec/helpers/ee/ide_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' - 'ee/spec/helpers/ee/registrations_helper_spec.rb' - 'ee/spec/helpers/ee/subscribable_banner_helper_spec.rb' - 'ee/spec/helpers/ee/users/callouts_helper_spec.rb' @@ -551,7 +550,6 @@ RSpec/ReceiveMessages: - 'spec/views/projects/settings/operations/show.html.haml_spec.rb' - 'spec/views/projects/settings/repository/_protected_branches.html.haml_spec.rb' - 'spec/views/projects/tags/index.html.haml_spec.rb' - - 'spec/views/projects/tree/show.html.haml_spec.rb' - 'spec/views/shared/_broadcast_message.html.haml_spec.rb' - 'spec/views/shared/projects/_list.html.haml_spec.rb' - 'spec/views/shared/projects/_project_card.html.haml_spec.rb' diff --git a/.rubocop_todo/rspec/subject_declaration.yml b/.rubocop_todo/rspec/subject_declaration.yml index 14001220e47..36f16257b4f 100644 --- a/.rubocop_todo/rspec/subject_declaration.yml +++ b/.rubocop_todo/rspec/subject_declaration.yml @@ -2,7 +2,6 @@ RSpec/SubjectDeclaration: Exclude: - 'ee/spec/finders/app_sec/fuzzing/coverage/corpuses_finder_spec.rb' - - 'ee/spec/helpers/ee/lock_helper_spec.rb' - 'ee/spec/helpers/nav/new_dropdown_helper_spec.rb' - 'ee/spec/lib/ee/api/helpers/notes_helpers_spec.rb' - 'ee/spec/lib/gitlab/expiring_subscription_message_spec.rb' diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index ad08de2fff0..d3c022aa6be 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -20f07b8be43ca7682d11bc1bafbc814a93d6befd +73881b727a2a17e48dc365784b7f0370f9c62376 diff --git a/GITLAB_KAS_VERSION b/GITLAB_KAS_VERSION index 91bd899a7af..874b007ca1a 100644 --- a/GITLAB_KAS_VERSION +++ b/GITLAB_KAS_VERSION @@ -1 +1 @@ -1ae70272d95c4c8128d8e8eb7c3dd0569f9980e4 +9f4dcab5a68db7c3fb30f29fa315b80011449cf0 diff --git a/app/assets/javascripts/batch_comments/components/review_drawer.vue b/app/assets/javascripts/batch_comments/components/review_drawer.vue index 7017169521a..3221327ecaa 100644 --- a/app/assets/javascripts/batch_comments/components/review_drawer.vue +++ b/app/assets/javascripts/batch_comments/components/review_drawer.vue @@ -279,7 +279,7 @@ export default { :header-height="getDrawerHeaderHeight" :z-index="$options.DRAWER_Z_INDEX" :open="drawerOpened" - class="merge-request-review-drawer" + class="merge-request-review-drawer !gl-w-screen !gl-max-w-2xl" data-testid="review-drawer-toggle" @close="setDrawerOpened(false)" > diff --git a/app/assets/javascripts/ci/common/pipeline_inputs/pipeline_inputs_form.vue b/app/assets/javascripts/ci/common/pipeline_inputs/pipeline_inputs_form.vue index 4196d4e7110..91e93512fcd 100644 --- a/app/assets/javascripts/ci/common/pipeline_inputs/pipeline_inputs_form.vue +++ b/app/assets/javascripts/ci/common/pipeline_inputs/pipeline_inputs_form.vue @@ -28,6 +28,11 @@ export default { required: false, default: false, }, + preselectAllInputs: { + type: Boolean, + required: false, + default: false, + }, queryRef: { type: String, required: true, @@ -78,7 +83,7 @@ export default { ...input, savedValue, value: hasSavedValue ? savedValue : input.default, - isSelected: hasSavedValue, + isSelected: hasSavedValue || this.preselectAllInputs, }; }); diff --git a/app/assets/javascripts/ci/pipeline_editor/components/editor/ci_editor_header.vue b/app/assets/javascripts/ci/pipeline_editor/components/editor/ci_editor_header.vue index 1d89d62018c..39b8af4886e 100644 --- a/app/assets/javascripts/ci/pipeline_editor/components/editor/ci_editor_header.vue +++ b/app/assets/javascripts/ci/pipeline_editor/components/editor/ci_editor_header.vue @@ -1,5 +1,6 @@