From 2b5399ae01393dfdd8bdbcd68cf38935b54264d4 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 25 Jul 2024 18:09:40 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- Gemfile.checksum | 2 +- Gemfile.lock | 2 +- .../create/components/issuable_form.vue | 2 +- .../components/issuable_label_selector.vue | 4 +- .../components/issuable_bulk_edit_sidebar.vue | 2 +- .../list/components/issuable_item.vue | 24 +- .../list/components/issuable_list_root.vue | 10 +- .../list/components/issuable_tabs.vue | 2 +- .../show/components/issuable_body.vue | 4 +- .../show/components/issuable_description.vue | 2 +- .../show/components/issuable_edit_form.vue | 7 +- .../show/components/issuable_header.vue | 8 +- .../show/components/issuable_title.vue | 10 +- app/helpers/application_helper.rb | 12 +- app/models/concerns/ci/taggable.rb | 107 + app/models/redirect_route.rb | 2 + app/views/admin/groups/edit.html.haml | 4 + app/views/admin/projects/edit.html.haml | 4 + app/views/admin/topics/edit.html.haml | 4 + app/views/admin/users/edit.html.haml | 4 + .../subscriptions/index.html.haml | 2 +- app/views/layouts/_diffs_colors_css.haml | 4 +- app/views/layouts/_head.html.haml | 14 +- app/views/layouts/component_preview.html.haml | 1 + ...up_level_vulnerability_report_grouping.yml | 8 - ...14000_fix_sequence_owners_for_ci_builds.rb | 9 +- .../monitoring/prometheus/gitlab_metrics.md | 1 + doc/api/integrations.md | 18 +- doc/api/status_checks.md | 1 + doc/ci/yaml/ci_job_log_timestamps.md | 2 +- doc/development/ai_features/duo_chat.md | 9 +- doc/development/sidekiq/worker_attributes.md | 8 +- doc/gitlab-basics/add-file.md | 1 + doc/topics/git/branch.md | 5 + doc/topics/git/how_to_install_git/index.md | 50 +- doc/topics/git/index.md | 118 +- doc/topics/git/undo.md | 18 +- doc/tutorials/learn_git.md | 2 + doc/tutorials/make_first_git_commit/index.md | 5 + .../vulnerability_report/index.md | 5 +- doc/user/group/moderate_users.md | 2 +- doc/user/permissions.md | 10 +- doc/user/project/integrations/matrix.md | 3 - .../output_example_snapshots/html.yml | 1990 -- .../prosemirror_json.yml | 24358 ---------------- lib/gitlab/database/type/tag_list_type.rb | 10 + lib/gitlab/middleware/go.rb | 9 +- .../concurrency_limit_service.rb | 7 + locale/gitlab.pot | 3 + package.json | 2 +- scripts/glfm/update-example-snapshots.rb | 2 +- .../lib/glfm/render_wysiwyg_html_and_json.js | 40 - scripts/lib/glfm/update_example_snapshots.rb | 64 +- spec/features/admin/admin_deploy_keys_spec.rb | 7 - spec/features/admin/admin_groups_spec.rb | 11 + spec/features/admin/admin_projects_spec.rb | 12 + spec/features/admin/admin_topics_spec.rb | 26 + spec/features/admin/users/users_spec.rb | 9 + .../content_editor/markdown_snapshot_spec.js | 94 - .../render_html_and_json_for_all_examples.js | 46 - .../components/issuable_description_spec.js | 2 +- .../show/components/issuable_title_spec.js | 2 +- .../mutations/achievements/award_spec.rb | 2 +- .../mutations/achievements/create_spec.rb | 8 +- .../mutations/achievements/delete_spec.rb | 2 +- .../delete_user_achievement_spec.rb | 2 +- .../mutations/achievements/revoke_spec.rb | 2 +- .../mutations/achievements/update_spec.rb | 2 +- .../alerts/set_assignees_spec.rb | 8 +- .../alerts/todo/create_spec.rb | 7 +- .../create_alert_issue_spec.rb | 8 +- .../http_integration/create_spec.rb | 9 +- .../http_integration/destroy_spec.rb | 8 +- .../http_integration/reset_token_spec.rb | 8 +- .../http_integration/update_spec.rb | 8 +- .../prometheus_integration/create_spec.rb | 7 +- .../reset_token_spec.rb | 8 +- .../prometheus_integration/update_spec.rb | 8 +- .../update_alert_status_spec.rb | 8 +- spec/graphql/mutations/boards/update_spec.rb | 10 +- .../graphql/mutations/branches/create_spec.rb | 17 +- .../add_group_or_project_spec.rb | 4 +- .../ci/job_token_scope/add_project_spec.rb | 4 +- .../ci/job_token_scope/remove_group_spec.rb | 4 +- .../ci/job_token_scope/remove_project_spec.rb | 4 +- .../design_management/delete_spec.rb | 11 +- .../mutations/design_management/move_spec.rb | 7 +- .../design_management/upload_spec.rb | 15 +- spec/helpers/application_helper_spec.rb | 6 - spec/lib/gitlab/middleware/go_spec.rb | 9 + .../concurrency_limit_service_spec.rb | 9 + .../fix_sequence_owners_for_ci_builds_spec.rb | 12 + spec/models/concerns/ci/taggable_spec.rb | 115 + spec/models/redirect_route_spec.rb | 40 + .../lib/glfm/update_example_snapshots_spec.rb | 355 +- spec/support/helpers/features/dom_helpers.rb | 7 + spec/support/helpers/graphql_helpers.rb | 7 + .../rolledup_dates_shared_examples.rb | 2 +- .../boards/update_list_shared_examples.rb | 4 +- .../boards_list_create_shared_examples.rb | 8 +- spec/views/layouts/_head.html.haml_spec.rb | 2 +- yarn.lock | 8 +- 102 files changed, 715 insertions(+), 27256 deletions(-) create mode 100644 app/models/concerns/ci/taggable.rb delete mode 100644 config/feature_flags/development/group_level_vulnerability_report_grouping.yml delete mode 100644 glfm_specification/output_example_snapshots/prosemirror_json.yml create mode 100644 lib/gitlab/database/type/tag_list_type.rb delete mode 100644 scripts/lib/glfm/render_wysiwyg_html_and_json.js create mode 100644 spec/features/admin/admin_topics_spec.rb delete mode 100644 spec/frontend/content_editor/markdown_snapshot_spec.js delete mode 100644 spec/frontend/content_editor/render_html_and_json_for_all_examples.js create mode 100644 spec/models/concerns/ci/taggable_spec.rb diff --git a/Gemfile.checksum b/Gemfile.checksum index 1c1c1d6bbae..6a1c1bb96de 100644 --- a/Gemfile.checksum +++ b/Gemfile.checksum @@ -226,7 +226,7 @@ {"name":"gitlab-styles","version":"12.0.1","platform":"ruby","checksum":"d8a302b0ab0e1f18e2d11501760f1b85c5e70b5e5ca628828a0786c7984ed133"}, {"name":"gitlab_chronic_duration","version":"0.12.0","platform":"ruby","checksum":"0d766944d415b5c831f176871ee8625783fc0c5bfbef2d79a3a616f207ffc16d"}, {"name":"gitlab_omniauth-ldap","version":"2.2.0","platform":"ruby","checksum":"bb4d20acb3b123ed654a8f6a47d3fac673ece7ed0b6992edb92dca14bad2838c"}, -{"name":"gitlab_quality-test_tooling","version":"1.32.0","platform":"ruby","checksum":"72b7bb243d3e1f8006bef4bcf3585480a774f72bb9dd97bfcc52db4b32fd30fb"}, +{"name":"gitlab_quality-test_tooling","version":"1.32.1","platform":"ruby","checksum":"6918e2048d25124583643d18d9d5cec7958976d98166a0affb5ee0386ce8be24"}, {"name":"globalid","version":"1.1.0","platform":"ruby","checksum":"b337e1746f0c8cb0a6c918234b03a1ddeb4966206ce288fbb57779f59b2d154f"}, {"name":"gon","version":"6.4.0","platform":"ruby","checksum":"e3a618d659392890f1aa7db420f17c75fd7d35aeb5f8fe003697d02c4b88d2f0"}, {"name":"google-apis-androidpublisher_v3","version":"0.34.0","platform":"ruby","checksum":"d7e1d7dd92f79c498fe2082222a1740d788e022e660c135564b3fd299cab5425"}, diff --git a/Gemfile.lock b/Gemfile.lock index 2ae13edd2ae..25e517e3c8e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -746,7 +746,7 @@ GEM omniauth (>= 1.3, < 3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) rubyntlm (~> 0.5) - gitlab_quality-test_tooling (1.32.0) + gitlab_quality-test_tooling (1.32.1) activesupport (>= 7.0, < 7.2) amatch (~> 0.4.1) gitlab (~> 4.19) diff --git a/app/assets/javascripts/vue_shared/issuable/create/components/issuable_form.vue b/app/assets/javascripts/vue_shared/issuable/create/components/issuable_form.vue index 64f0ec3fbc7..8fed8d0a23d 100644 --- a/app/assets/javascripts/vue_shared/issuable/create/components/issuable_form.vue +++ b/app/assets/javascripts/vue_shared/issuable/create/components/issuable_form.vue @@ -131,7 +131,7 @@ export default { -