Add latest changes from gitlab-org/gitlab@master

5 files changed, 49 insertions, 1 deletions

diff --git a/db/migrate/20231030205639_update_default_package_metadata_purl_types.rb b/db/migrate/20231030205639_update_default_package_metadata_purl_types.rb
new file mode 100644
index 00000000000..1e2f1ccb578
--- /dev/null
+++ b/db/migrate/20231030205639_update_default_package_metadata_purl_types.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class UpdateDefaultPackageMetadataPurlTypes < Gitlab::Database::Migration[2.2]
+  milestone '16.6'
+
+  disable_ddl_transaction!
+
+  PARTIALLY_ENABLED_SYNC = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12].freeze
+  FULLY_ENABLED_SYNC     = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13].freeze
+
+  def change
+    change_column_default :application_settings, :package_metadata_purl_types,
+      from: PARTIALLY_ENABLED_SYNC, to: FULLY_ENABLED_SYNC
+  end
+end
diff --git a/db/migrate/20231103162825_add_wolfi_purl_type_to_package_metadata_purl_types.rb b/db/migrate/20231103162825_add_wolfi_purl_type_to_package_metadata_purl_types.rb
new file mode 100644
index 00000000000..bdbe8aa3a63
--- /dev/null
+++ b/db/migrate/20231103162825_add_wolfi_purl_type_to_package_metadata_purl_types.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+# See https://docs.gitlab.com/ee/development/migration_style_guide.html
+# for more information on how to write migrations for GitLab.
+
+class AddWolfiPurlTypeToPackageMetadataPurlTypes < Gitlab::Database::Migration[2.2]
+  milestone '16.6'
+
+  restrict_gitlab_migration gitlab_schema: :gitlab_main
+
+  class ApplicationSetting < MigrationRecord
+  end
+
+  WOLFI_PURL_TYPE = 13
+
+  def up
+    application_setting = ApplicationSetting.last
+    return unless application_setting
+
+    application_setting.package_metadata_purl_types |= [WOLFI_PURL_TYPE]
+    application_setting.save
+  end
+
+  def down
+    application_setting = ApplicationSetting.last
+    return unless application_setting
+
+    application_setting.package_metadata_purl_types.delete(WOLFI_PURL_TYPE)
+    application_setting.save
+  end
+end
diff --git a/db/schema_migrations/20231030205639 b/db/schema_migrations/20231030205639
new file mode 100644
index 00000000000..4abedebbd44
--- /dev/null
+++ b/db/schema_migrations/20231030205639
@@ -0,0 +1 @@
+873fab24af680c9e33bedfe574f20a5a2242732b922bb4bd2f01d13180601de3
\ No newline at end of file
diff --git a/db/schema_migrations/20231103162825 b/db/schema_migrations/20231103162825
new file mode 100644
index 00000000000..6bb33354de4
--- /dev/null
+++ b/db/schema_migrations/20231103162825
@@ -0,0 +1 @@
+a6b5c59b0035f536185b94157950a2900754e07bcc2c6ea980cd9213f35b899c
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 8582b819feb..cde8c368f00 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -12075,7 +12075,7 @@ CREATE TABLE application_settings (
     encrypted_product_analytics_configurator_connection_string bytea,
     encrypted_product_analytics_configurator_connection_string_iv bytea,
     silent_mode_enabled boolean DEFAULT false NOT NULL,
-    package_metadata_purl_types smallint[] DEFAULT '{1,2,3,4,5,6,7,8,9,10,11,12}'::smallint[],
+    package_metadata_purl_types smallint[] DEFAULT '{1,2,3,4,5,6,7,8,9,10,11,12,13}'::smallint[],
     ci_max_includes integer DEFAULT 150 NOT NULL,
     remember_me_enabled boolean DEFAULT true NOT NULL,
     encrypted_anthropic_api_key bytea,