From 0134e6bc2789f7f5fe2d59ba0091174b31490bbb Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 12 Jun 2025 12:09:47 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../blob/components/blob_content.vue | 6 + .../boards/components/board_list_header.vue | 22 +++ .../pipeline_inputs/pipeline_inputs_form.vue | 6 + .../components/sidebar/job_container_item.vue | 6 +- .../components/toolbar_more_dropdown.vue | 27 +++- .../extensions/code_block_highlight.js | 24 +++ .../diffs/components/diff_app_controls.vue | 10 +- .../diffs/components/diff_stats.vue | 11 +- .../diffs/components/file_browser_toggle.vue | 2 +- .../javascripts/diffs/stores/file_browser.js | 7 + app/assets/javascripts/lib/utils/css_utils.js | 2 +- app/assets/javascripts/merge_request_tabs.js | 3 + .../explorer/pages/list.vue | 38 +++-- .../pinia/global_stores/viewport.js | 30 ++++ .../rapid_diffs/app/file_browser_drawer.vue | 83 ++++++++++ .../app/file_browser_drawer_toggle.vue | 36 +++++ .../javascripts/rapid_diffs/app/index.js | 11 ++ .../rapid_diffs/app/init_file_browser.js | 28 +++- .../rapid_diffs/app/view_settings.js | 1 + .../javascripts/rapid_diffs/stores/app.js | 9 ++ .../snippets/components/snippet_blob_view.vue | 1 + .../components/blob_viewers/rich_viewer.vue | 21 ++- .../vue_shared/components/markdown/header.vue | 79 +++++++++- .../components/rapid_diffs/app.scss | 11 +- app/assets/stylesheets/framework/files.scss | 4 + .../stylesheets/page_bundles/build.scss | 7 +- app/graphql/types/issue_type_enum.rb | 2 +- app/helpers/nav_helper.rb | 2 +- app/models/group.rb | 2 +- .../json_schemas/vulnerabilities_export.json | 50 ++++++ app/views/layouts/application.html.haml | 2 + .../nav/breadcrumbs/_breadcrumbs.html.haml | 1 + app/views/projects/branches/index.html.haml | 5 +- app/views/projects/commits/show.html.haml | 2 + app/views/projects/snippets/index.html.haml | 2 + .../design_management_designs_versions.yml | 12 +- ..._designs_versions_namespace_id_not_null.rb | 14 ++ db/schema_migrations/20250606164754 | 1 + db/structure.sql | 3 +- .../gitlab_duo_self_hosted/_index.md | 2 +- .../visibility_and_access_controls.md | 2 +- doc/api/graphql/reference/_index.md | 49 +++++- doc/api/vulnerability_exports.md | 38 ++++- lib/api/usage_data.rb | 5 - lib/gitlab/tracking/ai_tracking.rb | 3 - locale/gitlab.pot | 15 ++ package.json | 2 +- .../blob/components/blob_content_spec.js | 5 + .../components/board_list_header_spec.js | 1 + spec/frontend/boards/mock_data.js | 27 ++++ .../pipeline_inputs_form_spec.js | 27 ++++ .../components/toolbar_more_dropdown_spec.js | 42 +++-- .../extensions/code_block_highlight_spec.js | 17 ++ .../components/diff_app_controls_spec.js | 1 + .../diffs/stores/file_browser_spec.js | 16 ++ spec/frontend/merge_request_tabs_spec.js | 27 ++++ .../explorer/pages/list_spec.js | 16 ++ .../pinia/global_stores/viewport_spec.js | 50 ++++++ spec/frontend/rapid_diffs/app/app_spec.js | 14 ++ .../app/file_browser_drawer_spec.js | 75 +++++++++ .../app/file_browser_drawer_toggle_spec.js | 31 ++++ .../rapid_diffs/app/init_file_browser_spec.js | 147 ++++++++++++------ .../rapid_diffs/app/view_settings_spec.js | 2 + spec/frontend/rapid_diffs/stores/app_spec.js | 12 ++ .../components/snippet_blob_view_spec.js | 1 + .../blob_viewers/rich_viewer_spec.js | 11 +- .../components/markdown/header_spec.js | 58 ++++++- spec/lib/gitlab/database/sharding_key_spec.rb | 85 ++++++---- yarn.lock | 8 +- 69 files changed, 1214 insertions(+), 158 deletions(-) create mode 100644 app/assets/javascripts/pinia/global_stores/viewport.js create mode 100644 app/assets/javascripts/rapid_diffs/app/file_browser_drawer.vue create mode 100644 app/assets/javascripts/rapid_diffs/app/file_browser_drawer_toggle.vue create mode 100644 app/assets/javascripts/rapid_diffs/stores/app.js create mode 100644 app/validators/json_schemas/vulnerabilities_export.json create mode 100644 db/post_migrate/20250606164754_add_design_management_designs_versions_namespace_id_not_null.rb create mode 100644 db/schema_migrations/20250606164754 create mode 100644 spec/frontend/pinia/global_stores/viewport_spec.js create mode 100644 spec/frontend/rapid_diffs/app/file_browser_drawer_spec.js create mode 100644 spec/frontend/rapid_diffs/app/file_browser_drawer_toggle_spec.js create mode 100644 spec/frontend/rapid_diffs/stores/app_spec.js diff --git a/app/assets/javascripts/blob/components/blob_content.vue b/app/assets/javascripts/blob/components/blob_content.vue index a8c07333de6..66f5d6eaa65 100644 --- a/app/assets/javascripts/blob/components/blob_content.vue +++ b/app/assets/javascripts/blob/components/blob_content.vue @@ -70,6 +70,11 @@ export default { required: false, default: false, }, + isSnippet: { + type: Boolean, + required: false, + default: false, + }, }, data() { return { richContentLoaded: false }; @@ -123,6 +128,7 @@ export default { :project-path="projectPath" :blob-path="blob.path || ''" :rich-viewer="richViewer" + :is-snippet="isSnippet" :is-raw-content="isRawContent" :show-blame="showBlame" :file-name="blob.name" diff --git a/app/assets/javascripts/boards/components/board_list_header.vue b/app/assets/javascripts/boards/components/board_list_header.vue index a4baa375fdf..7bb00cb9b1f 100644 --- a/app/assets/javascripts/boards/components/board_list_header.vue +++ b/app/assets/javascripts/boards/components/board_list_header.vue @@ -119,6 +119,15 @@ export default { listTitle() { return this.list?.label?.description || this.list?.assignee?.name || this.list.title || ''; }, + listStatus() { + return this.list?.status || {}; + }, + listStatusColor() { + return this.listStatus?.color; + }, + listStatusIconName() { + return this.listStatus?.iconName; + }, isIterationList() { return this.listType === ListType.iteration; }, @@ -377,6 +386,18 @@ export default { class="gl-mr-3" /> +
+ input.value); + this.selectInputs(allInputs); + }, deselectAll() { this.inputs = this.inputs.map((input) => ({ ...input, @@ -277,6 +281,7 @@ export default { :toggle-text="s__('Pipelines|Select inputs')" :header-text="s__('Pipelines|Inputs')" :search-placeholder="s__('Pipelines|Search input name')" + :show-select-all-button-label="__('Select all')" :reset-button-label="__('Clear')" :disabled="!hasInputs" searchable @@ -286,6 +291,7 @@ export default { size="small" @reset="deselectAll" @select="selectInputs" + @select-all="selectAll" @search="handleSearch" /> diff --git a/app/assets/javascripts/ci/job_details/components/sidebar/job_container_item.vue b/app/assets/javascripts/ci/job_details/components/sidebar/job_container_item.vue index 0636b69d5bf..c212683a2d5 100644 --- a/app/assets/javascripts/ci/job_details/components/sidebar/job_container_item.vue +++ b/app/assets/javascripts/ci/job_details/components/sidebar/job_container_item.vue @@ -52,12 +52,12 @@ export default {