From 5d8fa5ee839441f21db6d8201509d0833451fa59 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 7 Jul 2025 15:12:24 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab/ci/setup.gitlab-ci.yml | 12 +- .gitlab/ci/vendored-gems.gitlab-ci.yml | 4 - .../rspec/example_without_description.yml | 1 - .rubocop_todo/rspec/receive_messages.yml | 1 - Gemfile | 4 - Gemfile.checksum | 1 - Gemfile.lock | 13 - Gemfile.next.checksum | 1 - Gemfile.next.lock | 13 - .../components/approval_count.vue | 14 +- .../list/components/discussions_badge.vue | 33 +- .../components/merge_request_statistics.vue | 17 +- .../list/components/issuable_item.vue | 13 +- .../merge_requests/_approvals_count.html.haml | 2 +- config/initializers/google_cloud_profiler.rb | 25 - ...7091253_add_indexes_to_sbom_graph_paths.rb | 20 + db/schema_migrations/20250707091253 | 1 + db/structure.sql | 4 + doc/api/search.md | 18 +- doc/development/feature_development.md | 1 + doc/development/user_contribution_mapping.md | 431 ++++++++++++++++++ .../container_scanning/_index.md | 12 + .../troubleshooting_dependency_scanning.md | 15 + .../active_context/migration/dictionary.rb | 7 + .../migration/dictionary_spec.rb | 125 +++++ lib/atlassian/jira_connect/client.rb | 15 +- .../placeholder_references/alias_resolver.rb | 5 + locale/gitlab.pot | 10 +- patches/highlight.js+11.11.1.patch | 99 +++- .../merge_request/user_approves_spec.rb | 2 +- .../components/approval_count_spec.js | 18 +- .../list/components/discussions_badge_spec.js | 5 +- .../google_cloud_profiler_spec.rb | 87 ---- .../lib/atlassian/jira_connect/client_spec.rb | 50 ++ .../alias_resolver_spec.rb | 21 +- ...n_placeholder_user_records_service_spec.rb | 3 +- .../gems/cloud_profiler_agent/.gitlab-ci.yml | 5 - vendor/gems/cloud_profiler_agent/Gemfile | 4 - vendor/gems/cloud_profiler_agent/Gemfile.lock | 126 ----- vendor/gems/cloud_profiler_agent/LICENSE | 23 - vendor/gems/cloud_profiler_agent/README.md | 30 -- .../cloud_profiler_agent.gemspec | 29 -- .../lib/cloud_profiler_agent.rb | 12 - .../lib/cloud_profiler_agent/agent.rb | 152 ------ .../lib/cloud_profiler_agent/looper.rb | 114 ----- .../lib/cloud_profiler_agent/pprof_builder.rb | 191 -------- .../cloud_profiler_agent/lib/profile_pb.rb | 85 ---- .../script/generate_profile.rb | 17 - .../spec/cloud_profiler_agent/cpu.stackprof | Bin 1733 -> 0 bytes .../spec/cloud_profiler_agent/looper_spec.rb | 176 ------- .../cloud_profiler_agent/object.stackprof | Bin 11714 -> 0 bytes .../pprof_builder_spec.rb | 103 ----- .../spec/cloud_profiler_agent/wall.stackprof | Bin 110819 -> 0 bytes .../cloud_profiler_agent/spec/spec_helper.rb | 21 - 54 files changed, 885 insertions(+), 1306 deletions(-) delete mode 100644 config/initializers/google_cloud_profiler.rb create mode 100644 db/post_migrate/20250707091253_add_indexes_to_sbom_graph_paths.rb create mode 100644 db/schema_migrations/20250707091253 create mode 100644 doc/development/user_contribution_mapping.md create mode 100644 gems/gitlab-active-context/spec/lib/active_context/migration/dictionary_spec.rb delete mode 100644 spec/initializers/google_cloud_profiler_spec.rb delete mode 100644 vendor/gems/cloud_profiler_agent/.gitlab-ci.yml delete mode 100644 vendor/gems/cloud_profiler_agent/Gemfile delete mode 100644 vendor/gems/cloud_profiler_agent/Gemfile.lock delete mode 100644 vendor/gems/cloud_profiler_agent/LICENSE delete mode 100644 vendor/gems/cloud_profiler_agent/README.md delete mode 100644 vendor/gems/cloud_profiler_agent/cloud_profiler_agent.gemspec delete mode 100644 vendor/gems/cloud_profiler_agent/lib/cloud_profiler_agent.rb delete mode 100644 vendor/gems/cloud_profiler_agent/lib/cloud_profiler_agent/agent.rb delete mode 100644 vendor/gems/cloud_profiler_agent/lib/cloud_profiler_agent/looper.rb delete mode 100644 vendor/gems/cloud_profiler_agent/lib/cloud_profiler_agent/pprof_builder.rb delete mode 100644 vendor/gems/cloud_profiler_agent/lib/profile_pb.rb delete mode 100755 vendor/gems/cloud_profiler_agent/script/generate_profile.rb delete mode 100644 vendor/gems/cloud_profiler_agent/spec/cloud_profiler_agent/cpu.stackprof delete mode 100644 vendor/gems/cloud_profiler_agent/spec/cloud_profiler_agent/looper_spec.rb delete mode 100644 vendor/gems/cloud_profiler_agent/spec/cloud_profiler_agent/object.stackprof delete mode 100644 vendor/gems/cloud_profiler_agent/spec/cloud_profiler_agent/pprof_builder_spec.rb delete mode 100644 vendor/gems/cloud_profiler_agent/spec/cloud_profiler_agent/wall.stackprof delete mode 100644 vendor/gems/cloud_profiler_agent/spec/spec_helper.rb diff --git a/.gitlab/ci/setup.gitlab-ci.yml b/.gitlab/ci/setup.gitlab-ci.yml index 45ca21d3bf5..2539733c2b6 100644 --- a/.gitlab/ci/setup.gitlab-ci.yml +++ b/.gitlab/ci/setup.gitlab-ci.yml @@ -138,8 +138,18 @@ detect-tests: - apt update && apt install -y curl - source ./scripts/utils.sh - source ./scripts/rspec_helpers.sh - - retrieve_tests_mapping "$MAPPING_ARCHIVE" - retrieve_frontend_fixtures_mapping + # Use alternative coverage based mappings for tier-2 pipeline + - | + echo "Fetching crystalball mappings" + if echo "$CI_MERGE_REQUEST_LABELS" | grep -q "pipeline::tier-2"; then + echo "Using alternative coverage based mapping path: $RSPEC_PACKED_TESTS_MAPPING_ALT_PATH" + MAPPING_ARCHIVE=$(echo "$RSPEC_PACKED_TESTS_MAPPING_ALT_PATH") + else + echo "Using standard described_class based mapping path: $RSPEC_PACKED_TESTS_MAPPING_PATH" + MAPPING_ARCHIVE=$(echo "$RSPEC_PACKED_TESTS_MAPPING_PATH") + fi + retrieve_tests_mapping "$MAPPING_ARCHIVE" script: - | # $FIND_CHANGES_MERGE_REQUEST_IID is defined in as-if-foss.gitlab-ci.yml diff --git a/.gitlab/ci/vendored-gems.gitlab-ci.yml b/.gitlab/ci/vendored-gems.gitlab-ci.yml index d8f99144440..f2831275c3a 100644 --- a/.gitlab/ci/vendored-gems.gitlab-ci.yml +++ b/.gitlab/ci/vendored-gems.gitlab-ci.yml @@ -23,10 +23,6 @@ include: inputs: gem_name: "devise-pbkdf2-encryptable" gem_path_prefix: "vendor/gems/" - - local: .gitlab/ci/templates/gem.gitlab-ci.yml - inputs: - gem_name: "cloud_profiler_agent" - gem_path_prefix: "vendor/gems/" - local: .gitlab/ci/templates/gem.gitlab-ci.yml inputs: gem_name: "sidekiq-reliable-fetch" diff --git a/.rubocop_todo/rspec/example_without_description.yml b/.rubocop_todo/rspec/example_without_description.yml index 4cef65b4638..8a0824e4f97 100644 --- a/.rubocop_todo/rspec/example_without_description.yml +++ b/.rubocop_todo/rspec/example_without_description.yml @@ -268,7 +268,6 @@ RSpec/ExampleWithoutDescription: - 'spec/helpers/sidebars_helper_spec.rb' - 'spec/initializers/diagnostic_reports_spec.rb' - 'spec/initializers/gitlab_http_spec.rb' - - 'spec/initializers/google_cloud_profiler_spec.rb' - 'spec/keeps/helpers/postgres_ai_spec.rb' - 'spec/lib/banzai/filter/commit_trailers_filter_spec.rb' - 'spec/lib/banzai/pipeline/incident_management/timeline_event_pipeline_spec.rb' diff --git a/.rubocop_todo/rspec/receive_messages.yml b/.rubocop_todo/rspec/receive_messages.yml index fa620cedb4f..a226ceecf2f 100644 --- a/.rubocop_todo/rspec/receive_messages.yml +++ b/.rubocop_todo/rspec/receive_messages.yml @@ -253,7 +253,6 @@ RSpec/ReceiveMessages: - 'spec/initializers/8_devise_spec.rb' - 'spec/initializers/carrierwave_s3_encryption_headers_patch_spec.rb' - 'spec/initializers/doorkeeper_spec.rb' - - 'spec/initializers/google_cloud_profiler_spec.rb' - 'spec/keeps/delete_old_feature_flags_spec.rb' - 'spec/lib/api/helpers/packages_helpers_spec.rb' - 'spec/lib/api/helpers_spec.rb' diff --git a/Gemfile b/Gemfile index 551ee1a3a9b..f6f2f086ef0 100644 --- a/Gemfile +++ b/Gemfile @@ -422,10 +422,6 @@ gem 'tty-prompt', '~> 0.23', require: false, feature_category: :shared # Perf bar gem 'peek', '~> 1.1', feature_category: :shared -# Google Cloud Profiler support -gem 'cloud_profiler_agent', '~> 0.0.0', path: 'vendor/gems/cloud_profiler_agent', require: false, - feature_category: :shared - # Snowplow events trackin gem 'snowplow-tracker', '~> 0.8.0', feature_category: :product_analytics diff --git a/Gemfile.checksum b/Gemfile.checksum index 5e66212c82f..92e279b3587 100644 --- a/Gemfile.checksum +++ b/Gemfile.checksum @@ -267,7 +267,6 @@ {"name":"google-cloud-env","version":"2.1.1","platform":"ruby","checksum":"cf4bb8c7d517ee1ea692baedf06e0b56ce68007549d8d5a66481aa9f97f46999"}, {"name":"google-cloud-errors","version":"1.3.0","platform":"ruby","checksum":"450b681e24c089a20721a01acc4408bb4a7b0df28c175aaab488da917480d64b"}, {"name":"google-cloud-location","version":"0.6.0","platform":"ruby","checksum":"386c99ca156e5cac413731c055d7d9c55629860129ad7658a2bf39ea5004d2d0"}, -{"name":"google-cloud-profiler-v2","version":"0.4.0","platform":"ruby","checksum":"53fc2ab175d08f54233c644310d47798feac996220916815c4fb44c937b5d3e3"}, {"name":"google-cloud-storage","version":"1.45.0","platform":"ruby","checksum":"f280abda4e608f9e91433f9dd907be4a45cdbf251ffeb275d713548e515c6300"}, {"name":"google-cloud-storage_transfer","version":"1.2.0","platform":"ruby","checksum":"132901f50889e02a0d378e6117c6408cbfc4fdbd15c9d31fabec4f4189ef1658"}, {"name":"google-cloud-storage_transfer-v1","version":"0.8.0","platform":"ruby","checksum":"9dbef80275db556e046bb24139ca6559affe641d1e38b2537b8caaf2f8896176"}, diff --git a/Gemfile.lock b/Gemfile.lock index aa0df090580..acee5a80809 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -132,15 +132,6 @@ PATH diffy (~> 3.4) oj (~> 3.16, >= 3.16.10) -PATH - remote: vendor/gems/cloud_profiler_agent - specs: - cloud_profiler_agent (0.0.1.pre) - google-cloud-profiler-v2 (~> 0.3) - google-protobuf (~> 3.25) - googleauth (>= 0.14) - stackprof (~> 0.2) - PATH remote: vendor/gems/devise-pbkdf2-encryptable specs: @@ -900,9 +891,6 @@ GEM google-cloud-location (0.6.0) gapic-common (>= 0.20.0, < 2.a) google-cloud-errors (~> 1.0) - google-cloud-profiler-v2 (0.4.0) - gapic-common (>= 0.18.0, < 2.a) - google-cloud-errors (~> 1.0) google-cloud-storage (1.45.0) addressable (~> 2.8) digest-crc (~> 0.4) @@ -2103,7 +2091,6 @@ DEPENDENCIES charlock_holmes (~> 0.7.9) circuitbox (= 2.0.0) click_house-client! - cloud_profiler_agent (~> 0.0.0)! commonmarker (~> 0.23.10) concurrent-ruby (~> 1.1) connection_pool (~> 2.5.3) diff --git a/Gemfile.next.checksum b/Gemfile.next.checksum index b67d6aa1aa5..03aeb92be68 100644 --- a/Gemfile.next.checksum +++ b/Gemfile.next.checksum @@ -267,7 +267,6 @@ {"name":"google-cloud-env","version":"2.1.1","platform":"ruby","checksum":"cf4bb8c7d517ee1ea692baedf06e0b56ce68007549d8d5a66481aa9f97f46999"}, {"name":"google-cloud-errors","version":"1.3.0","platform":"ruby","checksum":"450b681e24c089a20721a01acc4408bb4a7b0df28c175aaab488da917480d64b"}, {"name":"google-cloud-location","version":"0.6.0","platform":"ruby","checksum":"386c99ca156e5cac413731c055d7d9c55629860129ad7658a2bf39ea5004d2d0"}, -{"name":"google-cloud-profiler-v2","version":"0.4.0","platform":"ruby","checksum":"53fc2ab175d08f54233c644310d47798feac996220916815c4fb44c937b5d3e3"}, {"name":"google-cloud-storage","version":"1.45.0","platform":"ruby","checksum":"f280abda4e608f9e91433f9dd907be4a45cdbf251ffeb275d713548e515c6300"}, {"name":"google-cloud-storage_transfer","version":"1.2.0","platform":"ruby","checksum":"132901f50889e02a0d378e6117c6408cbfc4fdbd15c9d31fabec4f4189ef1658"}, {"name":"google-cloud-storage_transfer-v1","version":"0.8.0","platform":"ruby","checksum":"9dbef80275db556e046bb24139ca6559affe641d1e38b2537b8caaf2f8896176"}, diff --git a/Gemfile.next.lock b/Gemfile.next.lock index c7da29d17b0..7665b9909f2 100644 --- a/Gemfile.next.lock +++ b/Gemfile.next.lock @@ -132,15 +132,6 @@ PATH diffy (~> 3.4) oj (~> 3.16, >= 3.16.10) -PATH - remote: vendor/gems/cloud_profiler_agent - specs: - cloud_profiler_agent (0.0.1.pre) - google-cloud-profiler-v2 (~> 0.3) - google-protobuf (~> 3.25) - googleauth (>= 0.14) - stackprof (~> 0.2) - PATH remote: vendor/gems/devise-pbkdf2-encryptable specs: @@ -894,9 +885,6 @@ GEM google-cloud-location (0.6.0) gapic-common (>= 0.20.0, < 2.a) google-cloud-errors (~> 1.0) - google-cloud-profiler-v2 (0.4.0) - gapic-common (>= 0.18.0, < 2.a) - google-cloud-errors (~> 1.0) google-cloud-storage (1.45.0) addressable (~> 2.8) digest-crc (~> 0.4) @@ -2098,7 +2086,6 @@ DEPENDENCIES charlock_holmes (~> 0.7.9) circuitbox (= 2.0.0) click_house-client! - cloud_profiler_agent (~> 0.0.0)! commonmarker (~> 0.23.10) concurrent-ruby (~> 1.1) connection_pool (~> 2.5.3) diff --git a/app/assets/javascripts/merge_requests/components/approval_count.vue b/app/assets/javascripts/merge_requests/components/approval_count.vue index b317fba54ef..1393d2f39ce 100644 --- a/app/assets/javascripts/merge_requests/components/approval_count.vue +++ b/app/assets/javascripts/merge_requests/components/approval_count.vue @@ -36,15 +36,15 @@ export default { diff --git a/app/assets/javascripts/merge_requests/list/components/discussions_badge.vue b/app/assets/javascripts/merge_requests/list/components/discussions_badge.vue index aed06d198c3..bc446a24970 100644 --- a/app/assets/javascripts/merge_requests/list/components/discussions_badge.vue +++ b/app/assets/javascripts/merge_requests/list/components/discussions_badge.vue @@ -51,16 +51,25 @@ export default { diff --git a/app/assets/javascripts/merge_requests/list/components/merge_request_statistics.vue b/app/assets/javascripts/merge_requests/list/components/merge_request_statistics.vue index ebe1487f158..2cabbcc54a7 100644 --- a/app/assets/javascripts/merge_requests/list/components/merge_request_statistics.vue +++ b/app/assets/javascripts/merge_requests/list/components/merge_request_statistics.vue @@ -21,14 +21,15 @@ export default {