From fb05cd5e49c4a8288a6df1389da09fb57b615b06 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 20 May 2024 21:18:21 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../boards/components/board_form.vue | 4 +- .../boards/components/config_toggle.vue | 2 +- .../issues/create_merge_request_dropdown.js | 6 +- .../list/components/issue_card_statistics.vue | 6 +- .../service_desk/components/info_banner.vue | 6 +- .../issues/show/components/header_actions.vue | 4 +- .../components/incidents/incident_tabs.vue | 2 +- .../issues/show/components/sticky_header.vue | 2 +- app/assets/stylesheets/framework/common.scss | 4 +- app/assets/stylesheets/framework/diffs.scss | 4 +- .../stylesheets/framework/dropdowns.scss | 2 +- app/assets/stylesheets/framework/files.scss | 10 +- app/assets/stylesheets/framework/layout.scss | 4 +- app/assets/stylesheets/framework/mixins.scss | 2 +- app/assets/stylesheets/framework/popup.scss | 4 +- .../stylesheets/framework/typography.scss | 2 +- .../stylesheets/framework/variables.scss | 1 - .../highlight/conflict_colors.scss | 12 +- .../page_bundles/_ide_theme_overrides.scss | 4 +- app/assets/stylesheets/page_bundles/ide.scss | 2 +- app/assets/stylesheets/themes/_dark.scss | 1 - app/assets/stylesheets/vendors/atwho.scss | 2 +- .../projects/issues/_new_branch.html.haml | 6 +- ..._component_version_id_and_traversal_ids.rb | 19 + ...index_sbom_occurrences_for_aggregations.rb | 19 + db/schema_migrations/20240506202834 | 1 + db/schema_migrations/20240506202928 | 1 + db/structure.sql | 4 + .../blueprints/ci_data_decay/index.md | 2 +- .../incident_management/status_page.md | 4 + doc/subscriptions/choosing_subscription.md | 3 + doc/tutorials/agile_sprint/index.md | 6 +- doc/tutorials/make_first_git_commit/index.md | 8 + doc/tutorials/scrum_events/index.md | 29 +- doc/user/ai_experiments.md | 3 +- doc/user/group/epics/epic_boards.md | 2 +- doc/user/group/epics/index.md | 3 + doc/user/group/planning_hierarchy/index.md | 4 + doc/user/group/saml_sso/group_sync.md | 16 +- doc/user/markdown.md | 2559 +++++++++-------- .../img/issue_board_creation_v13_6.png | Bin 44050 -> 0 bytes .../img/issue_board_creation_v17_1.png | Bin 0 -> 48691 bytes doc/user/project/issue_board.md | 6 +- doc/user/project/members/index.md | 7 + doc/user/project/time_tracking.md | 53 +- doc/user/tasks.md | 6 + locale/gitlab.pot | 20 +- package.json | 2 +- .../boards/components/board_form_spec.js | 4 +- .../boards/components/config_toggle_spec.js | 8 +- .../create_merge_request_dropdown_spec.js | 2 +- .../helpers/database/duplicate_indexes.yml | 3 + spec/support/matchers/exceed_query_limit.rb | 9 +- yarn.lock | 8 +- 54 files changed, 1507 insertions(+), 1396 deletions(-) create mode 100644 db/post_migrate/20240506202834_index_sbom_occurrences_on_component_version_id_and_traversal_ids.rb create mode 100644 db/post_migrate/20240506202928_index_sbom_occurrences_for_aggregations.rb create mode 100644 db/schema_migrations/20240506202834 create mode 100644 db/schema_migrations/20240506202928 delete mode 100644 doc/user/project/img/issue_board_creation_v13_6.png create mode 100644 doc/user/project/img/issue_board_creation_v17_1.png diff --git a/app/assets/javascripts/boards/components/board_form.vue b/app/assets/javascripts/boards/components/board_form.vue index e2829553ce7..75314144025 100644 --- a/app/assets/javascripts/boards/components/board_form.vue +++ b/app/assets/javascripts/boards/components/board_form.vue @@ -29,8 +29,8 @@ export default { i18n: { [formType.new]: { title: s__('Board|Create new board'), btnText: s__('Board|Create board') }, [formType.delete]: { title: s__('Board|Delete board'), btnText: __('Delete') }, - [formType.edit]: { title: s__('Board|Edit board'), btnText: __('Save changes') }, - scopeModalTitle: s__('Board|Board scope'), + [formType.edit]: { title: s__('Board|Configure board'), btnText: __('Save changes') }, + scopeModalTitle: s__('Board|Board configuration'), cancelButtonText: __('Cancel'), deleteErrorMessage: s__('Board|Failed to delete board. Please try again.'), saveErrorMessage: __('Unable to save your changes. Please try again.'), diff --git a/app/assets/javascripts/boards/components/config_toggle.vue b/app/assets/javascripts/boards/components/config_toggle.vue index 96660bca88e..24256dbaf32 100644 --- a/app/assets/javascripts/boards/components/config_toggle.vue +++ b/app/assets/javascripts/boards/components/config_toggle.vue @@ -16,7 +16,7 @@ export default { inject: ['canAdminList'], computed: { buttonText() { - return this.canAdminList ? s__('Boards|Edit board') : s__('Boards|View scope'); + return this.canAdminList ? s__('Board|Configure board') : s__('Board|Board configuration'); }, }, methods: { diff --git a/app/assets/javascripts/issues/create_merge_request_dropdown.js b/app/assets/javascripts/issues/create_merge_request_dropdown.js index 4d45d662b30..50c28cc7d43 100644 --- a/app/assets/javascripts/issues/create_merge_request_dropdown.js +++ b/app/assets/javascripts/issues/create_merge_request_dropdown.js @@ -294,7 +294,7 @@ export default class CreateMergeRequestDropdown { } setLoading(loading) { - this.createMergeRequestLoading.classList.toggle('gl-display-none', !loading); + this.createMergeRequestLoading.classList.toggle('gl-hidden', !loading); } disableCreateAction() { @@ -588,10 +588,10 @@ export default class CreateMergeRequestDropdown { setUnavailableButtonState(isLoading = true) { if (isLoading) { - this.unavailableButtonSpinner.classList.remove('gl-display-none'); + this.unavailableButtonSpinner.classList.remove('gl-hidden'); this.unavailableButtonText.textContent = __('Checking branch availability...'); } else { - this.unavailableButtonSpinner.classList.add('gl-display-none'); + this.unavailableButtonSpinner.classList.add('gl-hidden'); this.unavailableButtonText.textContent = __('New branch unavailable'); } } diff --git a/app/assets/javascripts/issues/list/components/issue_card_statistics.vue b/app/assets/javascripts/issues/list/components/issue_card_statistics.vue index b3fd37dbc8a..25895bc381c 100644 --- a/app/assets/javascripts/issues/list/components/issue_card_statistics.vue +++ b/app/assets/javascripts/issues/list/components/issue_card_statistics.vue @@ -24,7 +24,7 @@ export default {
  • @@ -34,7 +34,7 @@ export default {
  • @@ -44,7 +44,7 @@ export default {
  • diff --git a/app/assets/javascripts/issues/service_desk/components/info_banner.vue b/app/assets/javascripts/issues/service_desk/components/info_banner.vue index 5667ee2f31d..674cafc96a8 100644 --- a/app/assets/javascripts/issues/service_desk/components/info_banner.vue +++ b/app/assets/javascripts/issues/service_desk/components/info_banner.vue @@ -38,11 +38,7 @@ export default {