From 8ed2760d39951c43a27051b44a2e9c1059a1eb3d Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 24 May 2024 06:19:05 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab-ci.yml | 4 - .gitlab/ci/cng/main.gitlab-ci.yml | 2 +- .gitlab/ci/setup.gitlab-ci.yml | 2 +- GITLAB_PAGES_VERSION | 2 +- .../list/components/issues_list_app.vue | 2 +- .../work_item_sidebar_dropdown_widget.vue | 2 +- .../components/work_item_detail.vue | 432 +++++++++--------- .../components/work_item_parent.vue | 69 ++- .../stylesheets/page_bundles/work_items.scss | 70 +-- app/services/merge_requests/base_service.rb | 8 + app/services/merge_requests/merge_service.rb | 3 +- .../merge_requests/post_merge_service.rb | 15 + .../merge_requests/refresh_service.rb | 8 - ..._component_version_id_and_traversal_ids.rb | 15 + ...ex_on_sbom_occurrences_for_aggregations.rb | 16 + db/schema_migrations/20240522164424 | 1 + db/schema_migrations/20240522164922 | 1 + doc/ci/docker/docker_layer_caching.md | 10 +- .../dependency_scanning/index.md | 7 +- .../troubleshooting_dependency_scanning.md | 4 - .../group/value_stream_analytics/index.md | 151 ++++++ .../hll_redis_key_overrides.yml | 1 - spec/factories/merge_requests.rb | 9 + .../gitlab/tracking/event_definition_spec.rb | 2 +- .../merge_requests/post_merge_service_spec.rb | 50 +- workhorse/go.mod | 14 +- workhorse/go.sum | 28 +- 27 files changed, 596 insertions(+), 332 deletions(-) create mode 100644 db/post_migrate/20240522164424_remove_index_on_sbom_occurrences_component_version_id_and_traversal_ids.rb create mode 100644 db/post_migrate/20240522164922_remove_index_on_sbom_occurrences_for_aggregations.rb create mode 100644 db/schema_migrations/20240522164424 create mode 100644 db/schema_migrations/20240522164922 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ed79bafba7d..35064e89941 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,14 +30,10 @@ default: .default-ruby-variables: &default-ruby-variables RUBY_VERSION: "3.1" OMNIBUS_GITLAB_CACHE_EDITION: "GITLAB_RUBY3_1" - OMNIBUS_RUBY_VERSION: "3.1.5" - CNG_RUBY_VERSION: "3.1.5" .next-ruby-variables: &next-ruby-variables RUBY_VERSION: "3.2" OMNIBUS_GITLAB_CACHE_EDITION: "GITLAB_RUBY3_2" - OMNIBUS_RUBY_VERSION: "3.2.4" - CNG_RUBY_VERSION: "3.2.4" .default-branch-pipeline-failure-variables: &default-branch-pipeline-failure-variables CREATE_RAILS_FLAKY_TEST_ISSUES: "true" diff --git a/.gitlab/ci/cng/main.gitlab-ci.yml b/.gitlab/ci/cng/main.gitlab-ci.yml index 26b6c83395e..d27a4ef4b08 100644 --- a/.gitlab/ci/cng/main.gitlab-ci.yml +++ b/.gitlab/ci/cng/main.gitlab-ci.yml @@ -24,7 +24,7 @@ include: script: - 'ruby -r./scripts/trigger-build.rb -e "puts Trigger.variables_for_env_file(Trigger::CNG.new.variables)" > $BUILD_ENV' - echo "GITLAB_ASSETS_TAG=$(assets_image_tag)" >> $BUILD_ENV - - echo "FULL_RUBY_VERSION=${CNG_RUBY_VERSION}" >> $BUILD_ENV + - ruby -e 'puts "FULL_RUBY_VERSION=#{RUBY_VERSION}"' >> build.env - cat $BUILD_ENV artifacts: reports: diff --git a/.gitlab/ci/setup.gitlab-ci.yml b/.gitlab/ci/setup.gitlab-ci.yml index 9fe52099026..c3cc646ba58 100644 --- a/.gitlab/ci/setup.gitlab-ci.yml +++ b/.gitlab/ci/setup.gitlab-ci.yml @@ -242,7 +242,7 @@ trigger-omnibus-env: echo "OMNIBUS_GITLAB_CACHE_EDITION=${OMNIBUS_GITLAB_CACHE_EDITION}" >> $BUILD_ENV for version_file in *_VERSION; do echo "$version_file=$(cat $version_file)" >> $BUILD_ENV; done echo "OMNIBUS_GITLAB_BUILD_ON_ALL_OS=${OMNIBUS_GITLAB_BUILD_ON_ALL_OS:-false}" >> $BUILD_ENV - echo "FULL_RUBY_VERSION=${OMNIBUS_RUBY_VERSION}" >> $BUILD_ENV + ruby -e 'puts "FULL_RUBY_VERSION=#{RUBY_VERSION}"' >> $BUILD_ENV echo "SHORT_RUBY_VERSION=${RUBY_VERSION}" >> $BUILD_ENV echo "GITLAB_ASSETS_TAG=$(assets_image_tag)" >> $BUILD_ENV echo "EE=$([[ $FOSS_ONLY == '1' ]] && echo 'false' || echo 'true')" >> $BUILD_ENV diff --git a/GITLAB_PAGES_VERSION b/GITLAB_PAGES_VERSION index 0d79e69bb77..18b4be48425 100644 --- a/GITLAB_PAGES_VERSION +++ b/GITLAB_PAGES_VERSION @@ -1 +1 @@ -c222f55359efa198efd2c26d6d1c305a50619119 +501588fde1b1d35d9d4e441cf1455da9e49e5b9c diff --git a/app/assets/javascripts/issues/list/components/issues_list_app.vue b/app/assets/javascripts/issues/list/components/issues_list_app.vue index 3063e69f63e..4cf515e1c0c 100644 --- a/app/assets/javascripts/issues/list/components/issues_list_app.vue +++ b/app/assets/javascripts/issues/list/components/issues_list_app.vue @@ -922,7 +922,7 @@ export default { :key="activeIssuable.iid" :work-item-iid="activeIssuable.iid" is-drawer - class="gl-pt-0! work-item-drawer" + class="gl-pt-0!" @work-item-updated="updateIssuablesCache" @work-item-emoji-updated="updateIssuableEmojis" @addChild="refetchIssuables" diff --git a/app/assets/javascripts/work_items/components/shared/work_item_sidebar_dropdown_widget.vue b/app/assets/javascripts/work_items/components/shared/work_item_sidebar_dropdown_widget.vue index 9cb534dd5d0..1176743849c 100644 --- a/app/assets/javascripts/work_items/components/shared/work_item_sidebar_dropdown_widget.vue +++ b/app/assets/javascripts/work_items/components/shared/work_item_sidebar_dropdown_widget.vue @@ -208,7 +208,6 @@ export default { diff --git a/app/assets/javascripts/work_items/components/work_item_parent.vue b/app/assets/javascripts/work_items/components/work_item_parent.vue index 51e8f534d82..0357ff752f2 100644 --- a/app/assets/javascripts/work_items/components/work_item_parent.vue +++ b/app/assets/javascripts/work_items/components/work_item_parent.vue @@ -242,42 +242,39 @@ export default { >{{ __('Apply') }} -
- -
- - - -
-
+ + +