From e002c48e3fac4a07801d7896e86d6fb31ff3c5a2 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 19 Aug 2024 15:07:29 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .rubocop_todo/gitlab/bounded_contexts.yml | 1 - .rubocop_todo/layout/line_length.yml | 1 - .rubocop_todo/rspec/context_wording.yml | 1 - .../style/inline_disable_annotation.yml | 1 - GITLAB_KAS_VERSION | 2 +- GITLAB_PAGES_VERSION | 2 +- .../design_description/description_form.vue | 12 +- .../design_notes/design_discussion.vue | 8 +- .../components/design_notes/design_note.vue | 10 +- .../design_notes/design_note_awards_list.vue | 2 +- .../design_notes/design_reply_form.vue | 2 +- .../design_notes/toggle_replies_widget.vue | 6 +- .../components/design_overlay.vue | 4 +- .../components/design_presentation.vue | 10 +- .../components/design_scaler.vue | 2 +- .../components/design_sidebar.vue | 6 +- .../design_management/components/image.vue | 4 +- .../components/list/item.vue | 24 +- .../components/toolbar/close_button.vue | 2 +- .../components/toolbar/design_navigation.vue | 2 +- .../components/toolbar/index.vue | 25 +- .../upload/design_version_dropdown.vue | 6 +- .../design_management/pages/design/index.vue | 16 +- .../design_management/pages/index.vue | 20 +- .../ide/components/branches/item.vue | 2 +- .../ide/components/merge_requests/item.vue | 2 +- .../ide/components/merge_requests/list.vue | 2 +- .../components/task_list_item_actions.vue | 5 +- .../components/create_work_item.vue | 101 ++++-- .../components/create_work_item_modal.vue | 79 ++++- .../components/work_item_description.vue | 8 +- .../work_item_description_rendered.vue | 54 +++- .../components/work_item_detail.vue | 1 + .../components/work_item_detail_modal.vue | 12 + app/assets/stylesheets/framework/buttons.scss | 23 -- app/finders/packages/conan/package_finder.rb | 31 +- .../metrics/dashboards/annotation_resolver.rb | 25 -- app/helpers/stat_anchors_helper.rb | 2 +- app/services/packages/conan/search_service.rb | 9 - .../conan/single_package_search_service.rb | 50 --- app/views/help/index.html.haml | 4 +- data/deprecations/15-9-trigger-job-status.yml | 42 --- ...culate_dora_deployment_frequency_score.yml | 2 +- ...43319_finalize_dora_df_scores_migration.rb | 24 ++ db/schema_migrations/20240806143319 | 1 + doc/administration/auth/oidc.md | 2 +- .../dedicated/hosted_runners.md | 2 +- doc/api/oauth2.md | 2 +- doc/ci/components/examples.md | 2 +- doc/ci/pipelines/pipeline_efficiency.md | 2 +- doc/development/advanced_search.md | 8 +- doc/development/code_review.md | 4 +- doc/development/work_items_widgets.md | 2 +- doc/solutions/integrations/index.md | 2 +- doc/topics/build_your_application.md | 2 +- doc/update/deprecations.md | 16 - doc/update/versions/gitlab_17_changes.md | 2 +- doc/user/clusters/agent/index.md | 2 +- doc/user/clusters/agent/work_with_agent.md | 4 +- doc/user/gitlab_duo/use_cases.md | 4 +- doc/user/gitlab_duo_chat/examples.md | 4 +- doc/user/group/saml_sso/index.md | 9 +- .../clusters/connect/new_civo_cluster.md | 2 +- .../delete_container_registry_images.md | 2 +- doc/user/permissions.md | 2 +- .../project/import/jira_migration_options.md | 121 ++++++++ doc/user/storage_management_automation.md | 4 +- doc/user/tasks.md | 6 +- locale/gitlab.pot | 5 +- package.json | 70 ++--- .../packages/conan/package_finder_spec.rb | 188 +++++++---- .../design_presentation_spec.js.snap | 10 +- .../list/__snapshots__/item_spec.js.snap | 20 +- .../toolbar/__snapshots__/index_spec.js.snap | 18 +- .../design/__snapshots__/index_spec.js.snap | 10 +- .../design_management/pages/index_spec.js | 2 +- .../components/task_list_item_actions_spec.js | 28 +- .../components/create_work_item_modal_spec.js | 20 +- .../components/create_work_item_spec.js | 104 +++++-- .../work_item_description_rendered_spec.js | 60 ++++ .../dashboards/annotation_resolver_spec.rb | 34 -- spec/helpers/stat_anchors_helper_spec.rb | 2 +- .../single_package_search_service_spec.rb | 45 --- spec/support/rspec_order_todo.yml | 1 - yarn.lock | 292 +++++++++--------- 85 files changed, 1012 insertions(+), 751 deletions(-) delete mode 100644 app/graphql/resolvers/metrics/dashboards/annotation_resolver.rb delete mode 100644 app/services/packages/conan/single_package_search_service.rb delete mode 100644 data/deprecations/15-9-trigger-job-status.yml create mode 100644 db/post_migrate/20240806143319_finalize_dora_df_scores_migration.rb create mode 100644 db/schema_migrations/20240806143319 create mode 100644 doc/user/project/import/jira_migration_options.md delete mode 100644 spec/graphql/resolvers/metrics/dashboards/annotation_resolver_spec.rb delete mode 100644 spec/services/packages/conan/single_package_search_service_spec.rb diff --git a/.rubocop_todo/gitlab/bounded_contexts.yml b/.rubocop_todo/gitlab/bounded_contexts.yml index 0c519bda117..27d5302e7dd 100644 --- a/.rubocop_todo/gitlab/bounded_contexts.yml +++ b/.rubocop_todo/gitlab/bounded_contexts.yml @@ -320,7 +320,6 @@ Gitlab/BoundedContexts: - 'app/graphql/resolvers/merge_requests_count_resolver.rb' - 'app/graphql/resolvers/merge_requests_resolver.rb' - 'app/graphql/resolvers/metadata_resolver.rb' - - 'app/graphql/resolvers/metrics/dashboards/annotation_resolver.rb' - 'app/graphql/resolvers/milestones_resolver.rb' - 'app/graphql/resolvers/namespace_projects_resolver.rb' - 'app/graphql/resolvers/namespace_resolver.rb' diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml index 3cb145b0b6b..805467b2c33 100644 --- a/.rubocop_todo/layout/line_length.yml +++ b/.rubocop_todo/layout/line_length.yml @@ -3154,7 +3154,6 @@ Layout/LineLength: - 'spec/graphql/resolvers/group_labels_resolver_spec.rb' - 'spec/graphql/resolvers/issue_status_counts_resolver_spec.rb' - 'spec/graphql/resolvers/merge_requests_resolver_spec.rb' - - 'spec/graphql/resolvers/metrics/dashboards/annotation_resolver_spec.rb' - 'spec/graphql/resolvers/namespace_projects_resolver_spec.rb' - 'spec/graphql/resolvers/project_issues_resolver_spec.rb' - 'spec/graphql/resolvers/project_jobs_resolver_spec.rb' diff --git a/.rubocop_todo/rspec/context_wording.yml b/.rubocop_todo/rspec/context_wording.yml index 7986c5f94b9..89167523d77 100644 --- a/.rubocop_todo/rspec/context_wording.yml +++ b/.rubocop_todo/rspec/context_wording.yml @@ -1312,7 +1312,6 @@ RSpec/ContextWording: - 'spec/graphql/resolvers/kas/agent_configurations_resolver_spec.rb' - 'spec/graphql/resolvers/kas/agent_connections_resolver_spec.rb' - 'spec/graphql/resolvers/last_commit_resolver_spec.rb' - - 'spec/graphql/resolvers/metrics/dashboards/annotation_resolver_spec.rb' - 'spec/graphql/resolvers/namespace_projects_resolver_spec.rb' - 'spec/graphql/resolvers/project_merge_requests_resolver_spec.rb' - 'spec/graphql/resolvers/project_milestones_resolver_spec.rb' diff --git a/.rubocop_todo/style/inline_disable_annotation.yml b/.rubocop_todo/style/inline_disable_annotation.yml index 956b5c75472..0b322ddda86 100644 --- a/.rubocop_todo/style/inline_disable_annotation.yml +++ b/.rubocop_todo/style/inline_disable_annotation.yml @@ -657,7 +657,6 @@ Style/InlineDisableAnnotation: - 'app/services/milestones/transfer_service.rb' - 'app/services/notification_recipients/builder/base.rb' - 'app/services/notification_service.rb' - - 'app/services/packages/conan/single_package_search_service.rb' - 'app/services/packages/create_dependency_service.rb' - 'app/services/packages/create_package_service.rb' - 'app/services/packages/debian/generate_distribution_key_service.rb' diff --git a/GITLAB_KAS_VERSION b/GITLAB_KAS_VERSION index d93e60a15e3..b2418f014ec 100644 --- a/GITLAB_KAS_VERSION +++ b/GITLAB_KAS_VERSION @@ -1 +1 @@ -05dd948633d85bb47756c124d9d579e31af4f65e +5781dd608fce1ca46c909fff310a51ae0b1d842f diff --git a/GITLAB_PAGES_VERSION b/GITLAB_PAGES_VERSION index 637668f1708..95eee3322db 100644 --- a/GITLAB_PAGES_VERSION +++ b/GITLAB_PAGES_VERSION @@ -1 +1 @@ -70858cdbfb881fec0dc548bdf0d962d6e189126e +29d46097991e04b0fb88ff233de45e3f9c98845b diff --git a/app/assets/javascripts/design_management/components/design_description/description_form.vue b/app/assets/javascripts/design_management/components/design_description/description_form.vue index 9a83680f9f1..739a84b98e4 100644 --- a/app/assets/javascripts/design_management/components/design_description/description_form.vue +++ b/app/assets/javascripts/design_management/components/design_description/description_form.vue @@ -168,7 +168,7 @@ export default { v-if="showEditor" class="design-description-form common-note-form" :label="$options.i18n.descriptionLabel" - label-class="!gl-leading-20 gl-font-lg!" + label-class="!gl-leading-20 !gl-text-lg" >
@@ -191,7 +191,7 @@ export default { @keydown.ctrl.enter="updateDesignDescription" @keydown.exact.esc.stop="closeForm" /> -
+
diff --git a/app/assets/javascripts/design_management/components/design_notes/design_reply_form.vue b/app/assets/javascripts/design_management/components/design_notes/design_reply_form.vue index 5c77de38ff8..5c4d8b6365f 100644 --- a/app/assets/javascripts/design_management/components/design_notes/design_reply_form.vue +++ b/app/assets/javascripts/design_management/components/design_notes/design_reply_form.vue @@ -222,7 +222,7 @@ export default { @keydown.esc.stop="cancelComment" /> -
+
  • @@ -70,7 +70,7 @@ export default { :avatar-size="24" badge-tooltip-prop="name" :badge-sr-only-text="authorCollapsedTooltip" - class="gl-whitespace-nowrap gl-mr-3" + class="gl-mr-3 gl-whitespace-nowrap" >