From d00599dae860008a057d47e0054397d6b456fcfd Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 3 Jul 2025 15:10:10 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab/ci/qa-common/variables.gitlab-ci.yml | 2 +- .../redundant_source_range.yml | 15 -- .rubocop_todo/rspec/change_by_zero.yml | 25 -- GITLAB_KAS_VERSION | 2 +- .../boards/components/board_list_header.vue | 14 +- .../boards/components/issue_due_date.vue | 6 +- .../homepage/components/work_items_widget.vue | 63 ++++- .../work_items_widget_metadata.query.graphql | 24 ++ .../issuable/components/issue_milestone.vue | 6 +- .../javascripts/lib/utils/websocket_utils.js | 105 ++++++++ .../notes/components/comment_form.vue | 15 +- .../notes/components/discussion_notes.vue | 8 +- .../notes/components/note_form.vue | 12 +- .../notes/components/noteable_discussion.vue | 8 +- .../notes/components/noteable_note.vue | 9 +- .../notes/mixins/discussion_navigation.js | 13 +- .../notes/mixins/issuable_state.js | 6 +- .../components/gitlab_duo_settings.vue | 7 +- .../shared/permissions/gitlab_duo_settings.js | 7 +- .../components/notes/placeholder_note.vue | 6 +- .../components/notes/system_note.vue | 9 +- .../components/work_item_type_icon.vue | 2 +- app/models/concerns/packages/downloadable.rb | 9 + app/models/merge_request.rb | 2 +- app/models/user.rb | 9 + .../oauth_access_token_cleanup_worker.rb | 2 +- config/initializers/1_settings.rb | 4 +- ...otected_branch_unprotect_access_levels.yml | 23 +- ...rotected_branch_unprotect_access_levels.rb | 16 ++ db/schema_migrations/20250630200458 | 1 + db/structure.sql | 3 +- doc/development/advanced_search.md | 8 +- .../policies/pipeline_execution_policies.md | 10 +- .../policies/security_policy_projects.md | 2 +- .../model_context_protocol/_index.md | 4 +- .../group/epics/img/epic_drawer_v17_4.png | Bin 69657 -> 0 bytes doc/user/group/epics/manage_epics.md | 83 +++--- .../build_and_push_images.md | 21 +- doc/user/project/issues/issue_work_items.md | 5 +- doc/user/workspace/_index.md | 23 ++ .../topology_service_client/base_service.rb | 12 +- .../service_ping_default_enabled_spec.rb | 2 +- rubocop/cop/gitlab/const_get_inherit_false.rb | 4 +- .../cop/gitlab/documentation_links/link.rb | 2 +- rubocop/cop/gitlab/http_v2.rb | 2 +- rubocop/cop/gitlab/httparty.rb | 4 +- rubocop/cop/gitlab/json.rb | 2 +- .../cop/inject_enterprise_edition_module.rb | 2 +- rubocop/cop/project_path_helper.rb | 2 +- rubocop/cop/rspec/before_all.rb | 2 +- .../rspec/factory_bot/inline_association.rb | 2 +- rubocop/cop/rspec/have_gitlab_http_status.rb | 2 +- spec/features/admin/users/users_spec.rb | 2 +- spec/features/boards/board_filters_spec.rb | 5 +- .../work_items_widget_metadata_query_mocks.js | 49 ++++ .../components/work_items_widget_spec.js | 59 +++- .../lib/utils/websocket_utils_spec.js | 251 ++++++++++++++++++ .../notes/components/comment_form_spec.js | 232 +++++----------- .../components/discussion_actions_spec.js | 3 - .../notes/components/discussion_notes_spec.js | 34 +-- .../notes/components/note_form_spec.js | 10 +- .../components/noteable_discussion_spec.js | 55 +--- .../notes/components/noteable_note_spec.js | 99 ++----- .../components/notes_activity_header_spec.js | 3 - .../mixins/discussion_navigation_spec.js | 31 +-- .../components/notes/placeholder_note_spec.js | 24 +- .../components/notes/system_note_spec.js | 18 +- .../api/entities/merge_request_basic_spec.rb | 3 +- spec/lib/api/helpers_spec.rb | 2 +- .../backfill_user_details_spec.rb | 2 +- .../cache/ci/project_pipeline_status_spec.rb | 2 +- .../checks/matching_merge_request_spec.rb | 2 +- .../batched_migration_runner_spec.rb | 10 +- .../partitioning/list/convert_table_spec.rb | 24 +- .../gitlab/database/tables_truncate_spec.rb | 7 +- spec/lib/gitlab/git_access_project_spec.rb | 2 +- .../pull_requests/review_importer_spec.rb | 8 +- .../importer/releases_importer_spec.rb | 4 +- .../ci/catalog/resource_seeder_spec.rb | 2 +- .../seeders/ci/variables_group_seeder_spec.rb | 5 +- .../ci/variables_project_seeder_spec.rb | 5 +- .../project_environment_seeder_spec.rb | 5 +- .../base_service_spec.rb | 10 +- ...t_from_project_saved_replies_table_spec.rb | 2 +- .../concerns/packages/downloadable_spec.rb | 26 +- .../slack_workspace/api_scope_spec.rb | 2 +- spec/models/user_spec.rb | 19 ++ spec/policies/ci/runner_policy_spec.rb | 25 ++ spec/requests/api/merge_requests_spec.rb | 18 +- spec/support/rspec_order_todo.yml | 1 - 90 files changed, 1069 insertions(+), 619 deletions(-) delete mode 100644 .rubocop_todo/internal_affairs/redundant_source_range.yml delete mode 100644 .rubocop_todo/rspec/change_by_zero.yml create mode 100644 app/assets/javascripts/homepage/graphql/queries/work_items_widget_metadata.query.graphql create mode 100644 app/assets/javascripts/lib/utils/websocket_utils.js create mode 100644 db/post_migrate/20250630200458_add_multi_column_not_null_constraint_to_protected_branch_unprotect_access_levels.rb create mode 100644 db/schema_migrations/20250630200458 delete mode 100644 doc/user/group/epics/img/epic_drawer_v17_4.png create mode 100644 spec/frontend/homepage/components/mocks/work_items_widget_metadata_query_mocks.js create mode 100644 spec/frontend/lib/utils/websocket_utils_spec.js diff --git a/.gitlab/ci/qa-common/variables.gitlab-ci.yml b/.gitlab/ci/qa-common/variables.gitlab-ci.yml index 0e22dc4b907..29fc40b8a52 100644 --- a/.gitlab/ci/qa-common/variables.gitlab-ci.yml +++ b/.gitlab/ci/qa-common/variables.gitlab-ci.yml @@ -18,7 +18,7 @@ variables: # Helm chart ref used by test-on-cng pipeline GITLAB_HELM_CHART_REF: "6cdb0e1cd4ceb7c9fd01ffa2f62c4a7a4c77a23b" # Specific ref for cng-mirror project to trigger builds for - GITLAB_CNG_MIRROR_REF: "df7aafcccafdbab732a7cf757efb3b7b74c851dd" + GITLAB_CNG_MIRROR_REF: "8c4bbd04b509dc6cc3cb0469066ef053db028607" # Makes sure some of the common scripts from pipeline-common use bundler to execute commands RUN_WITH_BUNDLE: "true" # Makes sure reporting script defined in .gitlab-qa-report from pipeline-common is executed from correct folder diff --git a/.rubocop_todo/internal_affairs/redundant_source_range.yml b/.rubocop_todo/internal_affairs/redundant_source_range.yml deleted file mode 100644 index 14c0623fc30..00000000000 --- a/.rubocop_todo/internal_affairs/redundant_source_range.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -# Cop supports --autocorrect. -InternalAffairs/RedundantSourceRange: - Details: grace period - Exclude: - - 'rubocop/cop/gitlab/const_get_inherit_false.rb' - - 'rubocop/cop/gitlab/documentation_links/link.rb' - - 'rubocop/cop/gitlab/http_v2.rb' - - 'rubocop/cop/gitlab/httparty.rb' - - 'rubocop/cop/gitlab/json.rb' - - 'rubocop/cop/inject_enterprise_edition_module.rb' - - 'rubocop/cop/project_path_helper.rb' - - 'rubocop/cop/rspec/before_all.rb' - - 'rubocop/cop/rspec/factory_bot/inline_association.rb' - - 'rubocop/cop/rspec/have_gitlab_http_status.rb' diff --git a/.rubocop_todo/rspec/change_by_zero.yml b/.rubocop_todo/rspec/change_by_zero.yml deleted file mode 100644 index 9ba6adcc8d7..00000000000 --- a/.rubocop_todo/rspec/change_by_zero.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- -# Cop supports --autocorrect. -RSpec/ChangeByZero: - Exclude: - - 'ee/spec/controllers/groups/todos_controller_spec.rb' - - 'ee/spec/lib/ee/gitlab/scim/group/deprovisioning_service_spec.rb' - - 'ee/spec/lib/merge_requests/external_status_check_changes_auditor_spec.rb' - - 'ee/spec/models/ee/project_member_spec.rb' - - 'spec/features/admin/users/users_spec.rb' - - 'spec/lib/api/helpers_spec.rb' - - 'spec/lib/gitlab/background_migration/backfill_user_details_spec.rb' - - 'spec/lib/gitlab/cache/ci/project_pipeline_status_spec.rb' - - 'spec/lib/gitlab/checks/matching_merge_request_spec.rb' - - 'spec/lib/gitlab/database/background_migration/batched_migration_runner_spec.rb' - - 'spec/lib/gitlab/database/partitioning/list/convert_table_spec.rb' - - 'spec/lib/gitlab/database/tables_truncate_spec.rb' - - 'spec/lib/gitlab/git_access_project_spec.rb' - - 'spec/lib/gitlab/github_import/importer/pull_requests/review_importer_spec.rb' - - 'spec/lib/gitlab/github_import/importer/releases_importer_spec.rb' - - 'spec/lib/gitlab/seeders/ci/catalog/resource_seeder_spec.rb' - - 'spec/lib/gitlab/seeders/ci/variables_group_seeder_spec.rb' - - 'spec/lib/gitlab/seeders/ci/variables_project_seeder_spec.rb' - - 'spec/lib/gitlab/seeders/project_environment_seeder_spec.rb' - - 'spec/migrations/db/migrate/20240806100120_remove_records_without_project_from_project_saved_replies_table_spec.rb' - - 'spec/models/integrations/slack_workspace/api_scope_spec.rb' diff --git a/GITLAB_KAS_VERSION b/GITLAB_KAS_VERSION index 604d6f290bc..a478b6cd13f 100644 --- a/GITLAB_KAS_VERSION +++ b/GITLAB_KAS_VERSION @@ -1 +1 @@ -42fc100c92311d4989681df8c62b91cd18edb886 +79d381bd3d4933427e3f3f08821b0e81310764d0 diff --git a/app/assets/javascripts/boards/components/board_list_header.vue b/app/assets/javascripts/boards/components/board_list_header.vue index aedc1091714..6846363939a 100644 --- a/app/assets/javascripts/boards/components/board_list_header.vue +++ b/app/assets/javascripts/boards/components/board_list_header.vue @@ -349,7 +349,7 @@ export default { class="board-title gl-m-0 gl-flex gl-h-9 gl-items-center gl-px-3 gl-text-base" > diff --git a/app/assets/javascripts/homepage/components/work_items_widget.vue b/app/assets/javascripts/homepage/components/work_items_widget.vue index aae4c34c41c..45616f7e522 100644 --- a/app/assets/javascripts/homepage/components/work_items_widget.vue +++ b/app/assets/javascripts/homepage/components/work_items_widget.vue @@ -1,12 +1,16 @@