From 90d6654d6efd6a3a2a7077ba9b0a939a7cee7c1c Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 21 Nov 2024 09:32:23 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .rubocop_todo/rspec/be_eq.yml | 1 - .rubocop_todo/rspec/receive_messages.yml | 1 - GITLAB_KAS_VERSION | 2 +- Gemfile.checksum | 4 +- Gemfile.lock | 6 +- Gemfile.next.checksum | 4 +- Gemfile.next.lock | 6 +- .../wikis/components/clone_wiki_modal.vue | 5 - .../components/mr_widget_migrate_jenkins.vue | 18 + .../mr_widget_options.vue | 8 +- .../stores/mr_widget_store.js | 3 +- app/helpers/application_settings_helper.rb | 3 +- .../application_setting_implementation.rb | 3 +- .../customer_relations/issue_contact.rb | 2 + app/models/namespaces/project_namespace.rb | 1 + .../merge_request_widget_entity.rb | 12 + .../metadata/process_file_service.rb | 2 + .../data_sync/widgets/crm_contacts.rb | 37 +- .../application_settings/_ci_cd.html.haml | 2 + .../show_migrate_from_jenkins_banner.yml | 12 + config/events/scan.yml | 2 +- .../toggle_security_training_provider.yml | 2 +- ...panding_secure_security_report_monthly.yml | 2 +- ...xpanding_secure_security_report_weekly.yml | 2 +- config/metrics/schema/product_groups.json | 2 +- ...rate_jenkins_banner_application_setting.rb | 9 + db/schema_migrations/20241108172443 | 1 + db/structure.sql | 1 + .../settings/continuous_integration.md | 15 + .../suggest_migrate_from_jenkins_v_17_7.png | Bin 0 -> 7651 bytes lib/api/settings.rb | 1 + locale/gitlab.pot | 6 + scripts/semgrep_result_processor.rb | 11 + spec/features/admin/admin_settings_spec.rb | 2 + .../mr_widget_migrate_jenkins_spec.js | 28 +- .../packages/maven_cached_responses_spec.rb | 233 ++++ .../packages/maven_registries_spec.rb | 385 ++++++ .../virtual_registries/packages/maven_spec.rb | 1152 +---------------- .../packages/maven_upstreams_spec.rb | 447 +++++++ spec/scripts/semgrep_result_processor_spec.rb | 44 + .../metadata/extract_files_service_spec.rb | 20 + .../metadata/process_file_service_spec.rb | 2 + .../data_sync/clone_service_spec.rb | 3 +- .../work_items/data_sync/move_service_spec.rb | 5 +- .../data_sync/widgets/crm_contacts_spec.rb | 112 ++ .../requests/api/maven_vreg_shared_context.rb | 49 + .../maven_packages_shared_examples.rb | 43 + ...eable_and_moveable_data_stared_examples.rb | 29 +- 48 files changed, 1558 insertions(+), 1182 deletions(-) create mode 100644 config/application_setting_columns/show_migrate_from_jenkins_banner.yml create mode 100644 db/migrate/20241108172443_add_migrate_jenkins_banner_application_setting.rb create mode 100644 db/schema_migrations/20241108172443 create mode 100644 doc/administration/settings/img/suggest_migrate_from_jenkins_v_17_7.png create mode 100644 spec/requests/api/virtual_registries/packages/maven_cached_responses_spec.rb create mode 100644 spec/requests/api/virtual_registries/packages/maven_registries_spec.rb create mode 100644 spec/requests/api/virtual_registries/packages/maven_upstreams_spec.rb create mode 100644 spec/services/work_items/data_sync/widgets/crm_contacts_spec.rb create mode 100644 spec/support/shared_contexts/requests/api/maven_vreg_shared_context.rb create mode 100644 spec/support/shared_examples/requests/api/virtual_registries/maven_packages_shared_examples.rb diff --git a/.rubocop_todo/rspec/be_eq.yml b/.rubocop_todo/rspec/be_eq.yml index d741dcf0fbd..b2d999aebdf 100644 --- a/.rubocop_todo/rspec/be_eq.yml +++ b/.rubocop_todo/rspec/be_eq.yml @@ -1293,7 +1293,6 @@ RSpec/BeEq: - 'spec/requests/api/settings_spec.rb' - 'spec/requests/api/users_preferences_spec.rb' - 'spec/requests/api/users_spec.rb' - - 'spec/requests/api/virtual_registries/packages/maven_spec.rb' - 'spec/requests/groups/deploy_tokens_controller_spec.rb' - 'spec/requests/openid_connect_spec.rb' - 'spec/requests/organizations/organizations_controller_spec.rb' diff --git a/.rubocop_todo/rspec/receive_messages.yml b/.rubocop_todo/rspec/receive_messages.yml index f3de4a5635c..b74bdd87bfb 100644 --- a/.rubocop_todo/rspec/receive_messages.yml +++ b/.rubocop_todo/rspec/receive_messages.yml @@ -444,7 +444,6 @@ RSpec/ReceiveMessages: - 'spec/requests/api/helpers_spec.rb' - 'spec/requests/api/maven_packages_spec.rb' - 'spec/requests/api/search_spec.rb' - - 'spec/requests/api/virtual_registries/packages/maven_spec.rb' - 'spec/requests/projects/google_cloud/databases_controller_spec.rb' - 'spec/requests/projects/google_cloud/service_accounts_controller_spec.rb' - 'spec/requests/projects/redirect_controller_spec.rb' diff --git a/GITLAB_KAS_VERSION b/GITLAB_KAS_VERSION index 3a8ad75c44d..b847bb37e82 100644 --- a/GITLAB_KAS_VERSION +++ b/GITLAB_KAS_VERSION @@ -1 +1 @@ -ccbba5a4c00e02b85995b6ad75ed5fa3274ccaea +f519c72b578be1182b4492a958c1fc48fe593e76 diff --git a/Gemfile.checksum b/Gemfile.checksum index cbce40905fe..747ac624bc1 100644 --- a/Gemfile.checksum +++ b/Gemfile.checksum @@ -464,7 +464,7 @@ {"name":"opentelemetry-exporter-otlp","version":"0.29.0","platform":"ruby","checksum":"4d1ca0e01cab8127dcc43eb3b51845dfce2b972d51033df7ce33adbdc30681fa"}, {"name":"opentelemetry-helpers-sql-obfuscation","version":"0.1.0","platform":"ruby","checksum":"bc6ef1373dbcf979647091b3bfc99d7b6fb9669f74c3ae184f58b48adfc8d432"}, {"name":"opentelemetry-instrumentation-action_mailer","version":"0.2.0","platform":"ruby","checksum":"88f2dd8cff27886e84bbf522b698f0bf86b83f0f0adb0d3d27b3fa8211b1cb0e"}, -{"name":"opentelemetry-instrumentation-action_pack","version":"0.9.0","platform":"ruby","checksum":"c5df8472afc9cdbfc1425d9af7816b9cfc1a1a69b86621f1fc624974bd9acb9a"}, +{"name":"opentelemetry-instrumentation-action_pack","version":"0.10.0","platform":"ruby","checksum":"2d821a45be4c2a281cfa42ec96562268b50ff5d5fac77386e7e39e792bceab02"}, {"name":"opentelemetry-instrumentation-action_view","version":"0.7.3","platform":"ruby","checksum":"6da829154e751bd88f5369b97a6346e12c3583a784f58178ccaa0b46d301ea21"}, {"name":"opentelemetry-instrumentation-active_job","version":"0.7.8","platform":"ruby","checksum":"281b3d9bace7aac9f1e121b75f294e7ee8beaedd1f20405539c54df2e6763942"}, {"name":"opentelemetry-instrumentation-active_record","version":"0.8.0","platform":"ruby","checksum":"199d83102e81f5d6236025f4e6507513ffd2e6a2231e9951d0723708cc96c1c8"}, @@ -482,7 +482,7 @@ {"name":"opentelemetry-instrumentation-net_http","version":"0.22.7","platform":"ruby","checksum":"c07427ff6b7bed124bf004008be4d3a4aef8865629f7a2c4614c4a8d357246d0"}, {"name":"opentelemetry-instrumentation-pg","version":"0.29.0","platform":"ruby","checksum":"6fcbdddfb757fed97b3bce0fb9f5f206d4cdb5c24e3da78c0dc54100c195f3d1"}, {"name":"opentelemetry-instrumentation-rack","version":"0.25.0","platform":"ruby","checksum":"539c8b4f6b818e16495e9016126537b4d1cc53292219f1acc35006fe30ce243d"}, -{"name":"opentelemetry-instrumentation-rails","version":"0.32.0","platform":"ruby","checksum":"0851ca626d608dc1f6bcd12d81d65a61fd0299f2ccd23cc9bf444309a831d28e"}, +{"name":"opentelemetry-instrumentation-rails","version":"0.33.0","platform":"ruby","checksum":"f00cc90ffeb9d612225b2797162efafcf60eda032330e138d4493bd66310206d"}, {"name":"opentelemetry-instrumentation-rake","version":"0.2.2","platform":"ruby","checksum":"fbde8a6aab77c09bf0f94d914dd26dcf2e23ec67e2300f06a1cb8294a97d8020"}, {"name":"opentelemetry-instrumentation-redis","version":"0.25.7","platform":"ruby","checksum":"2ea0f2d45fe1af0689aeadc08f5b335a2b6d9463de9d855fd25313d3c5b42fe3"}, {"name":"opentelemetry-instrumentation-sidekiq","version":"0.25.7","platform":"ruby","checksum":"d6a6e2cadddfda0a0b641f9dc918e35a77bfc62bc90b80776f5194bd55e0df31"}, diff --git a/Gemfile.lock b/Gemfile.lock index 71305f2e361..e9aeea3d1ae 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1291,7 +1291,7 @@ GEM opentelemetry-api (~> 1.0) opentelemetry-instrumentation-active_support (~> 0.1) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-action_pack (0.9.0) + opentelemetry-instrumentation-action_pack (0.10.0) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-rack (~> 0.21) @@ -1349,10 +1349,10 @@ GEM opentelemetry-instrumentation-rack (0.25.0) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-rails (0.32.0) + opentelemetry-instrumentation-rails (0.33.0) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-action_mailer (~> 0.2.0) - opentelemetry-instrumentation-action_pack (~> 0.9.0) + opentelemetry-instrumentation-action_pack (~> 0.10.0) opentelemetry-instrumentation-action_view (~> 0.7.0) opentelemetry-instrumentation-active_job (~> 0.7.0) opentelemetry-instrumentation-active_record (~> 0.8.0) diff --git a/Gemfile.next.checksum b/Gemfile.next.checksum index 8d92ebda438..f164eea7557 100644 --- a/Gemfile.next.checksum +++ b/Gemfile.next.checksum @@ -469,7 +469,7 @@ {"name":"opentelemetry-exporter-otlp","version":"0.29.0","platform":"ruby","checksum":"4d1ca0e01cab8127dcc43eb3b51845dfce2b972d51033df7ce33adbdc30681fa"}, {"name":"opentelemetry-helpers-sql-obfuscation","version":"0.1.0","platform":"ruby","checksum":"bc6ef1373dbcf979647091b3bfc99d7b6fb9669f74c3ae184f58b48adfc8d432"}, {"name":"opentelemetry-instrumentation-action_mailer","version":"0.2.0","platform":"ruby","checksum":"88f2dd8cff27886e84bbf522b698f0bf86b83f0f0adb0d3d27b3fa8211b1cb0e"}, -{"name":"opentelemetry-instrumentation-action_pack","version":"0.9.0","platform":"ruby","checksum":"c5df8472afc9cdbfc1425d9af7816b9cfc1a1a69b86621f1fc624974bd9acb9a"}, +{"name":"opentelemetry-instrumentation-action_pack","version":"0.10.0","platform":"ruby","checksum":"2d821a45be4c2a281cfa42ec96562268b50ff5d5fac77386e7e39e792bceab02"}, {"name":"opentelemetry-instrumentation-action_view","version":"0.7.3","platform":"ruby","checksum":"6da829154e751bd88f5369b97a6346e12c3583a784f58178ccaa0b46d301ea21"}, {"name":"opentelemetry-instrumentation-active_job","version":"0.7.8","platform":"ruby","checksum":"281b3d9bace7aac9f1e121b75f294e7ee8beaedd1f20405539c54df2e6763942"}, {"name":"opentelemetry-instrumentation-active_record","version":"0.8.0","platform":"ruby","checksum":"199d83102e81f5d6236025f4e6507513ffd2e6a2231e9951d0723708cc96c1c8"}, @@ -487,7 +487,7 @@ {"name":"opentelemetry-instrumentation-net_http","version":"0.22.7","platform":"ruby","checksum":"c07427ff6b7bed124bf004008be4d3a4aef8865629f7a2c4614c4a8d357246d0"}, {"name":"opentelemetry-instrumentation-pg","version":"0.29.0","platform":"ruby","checksum":"6fcbdddfb757fed97b3bce0fb9f5f206d4cdb5c24e3da78c0dc54100c195f3d1"}, {"name":"opentelemetry-instrumentation-rack","version":"0.25.0","platform":"ruby","checksum":"539c8b4f6b818e16495e9016126537b4d1cc53292219f1acc35006fe30ce243d"}, -{"name":"opentelemetry-instrumentation-rails","version":"0.32.0","platform":"ruby","checksum":"0851ca626d608dc1f6bcd12d81d65a61fd0299f2ccd23cc9bf444309a831d28e"}, +{"name":"opentelemetry-instrumentation-rails","version":"0.33.0","platform":"ruby","checksum":"f00cc90ffeb9d612225b2797162efafcf60eda032330e138d4493bd66310206d"}, {"name":"opentelemetry-instrumentation-rake","version":"0.2.2","platform":"ruby","checksum":"fbde8a6aab77c09bf0f94d914dd26dcf2e23ec67e2300f06a1cb8294a97d8020"}, {"name":"opentelemetry-instrumentation-redis","version":"0.25.7","platform":"ruby","checksum":"2ea0f2d45fe1af0689aeadc08f5b335a2b6d9463de9d855fd25313d3c5b42fe3"}, {"name":"opentelemetry-instrumentation-sidekiq","version":"0.25.7","platform":"ruby","checksum":"d6a6e2cadddfda0a0b641f9dc918e35a77bfc62bc90b80776f5194bd55e0df31"}, diff --git a/Gemfile.next.lock b/Gemfile.next.lock index 011a55c51f0..58e1ab904d8 100644 --- a/Gemfile.next.lock +++ b/Gemfile.next.lock @@ -1306,7 +1306,7 @@ GEM opentelemetry-api (~> 1.0) opentelemetry-instrumentation-active_support (~> 0.1) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-action_pack (0.9.0) + opentelemetry-instrumentation-action_pack (0.10.0) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-rack (~> 0.21) @@ -1364,10 +1364,10 @@ GEM opentelemetry-instrumentation-rack (0.25.0) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-rails (0.32.0) + opentelemetry-instrumentation-rails (0.33.0) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-action_mailer (~> 0.2.0) - opentelemetry-instrumentation-action_pack (~> 0.9.0) + opentelemetry-instrumentation-action_pack (~> 0.10.0) opentelemetry-instrumentation-action_view (~> 0.7.0) opentelemetry-instrumentation-active_job (~> 0.7.0) opentelemetry-instrumentation-active_record (~> 0.8.0) diff --git a/app/assets/javascripts/pages/shared/wikis/components/clone_wiki_modal.vue b/app/assets/javascripts/pages/shared/wikis/components/clone_wiki_modal.vue index 35cc7c0f807..de31b2c7ad4 100644 --- a/app/assets/javascripts/pages/shared/wikis/components/clone_wiki_modal.vue +++ b/app/assets/javascripts/pages/shared/wikis/components/clone_wiki_modal.vue @@ -132,7 +132,6 @@ export default { @@ -151,7 +150,6 @@ export default { @@ -175,7 +173,6 @@ export default { @@ -194,7 +191,6 @@ export default { @@ -213,7 +209,6 @@ export default { diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_migrate_jenkins.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_migrate_jenkins.vue index e843ccf9882..522ef23f0c7 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_migrate_jenkins.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_migrate_jenkins.vue @@ -1,6 +1,8 @@