Add latest changes from gitlab-org/gitlab@master

5 files changed, 20 insertions, 0 deletions

diff --git a/db/migrate/20230403145705_add_purl_sync_to_settings.rb b/db/migrate/20230403145705_add_purl_sync_to_settings.rb
new file mode 100644
index 00000000000..3bc9ce07235
--- /dev/null
+++ b/db/migrate/20230403145705_add_purl_sync_to_settings.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddPurlSyncToSettings < Gitlab::Database::Migration[2.1]
+  def change
+    add_column :application_settings, :package_metadata_purl_types, :smallint, array: true, default: []
+  end
+end
diff --git a/db/migrate/20230406134436_add_identity_toggle_to_user_preferences.rb b/db/migrate/20230406134436_add_identity_toggle_to_user_preferences.rb
new file mode 100644
index 00000000000..0b7fcceb3ee
--- /dev/null
+++ b/db/migrate/20230406134436_add_identity_toggle_to_user_preferences.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddIdentityToggleToUserPreferences < Gitlab::Database::Migration[2.1]
+  enable_lock_retries!
+
+  def change
+    add_column :user_preferences, :pass_user_identities_to_ci_jwt, :boolean, default: false, null: false
+  end
+end
diff --git a/db/schema_migrations/20230403145705 b/db/schema_migrations/20230403145705
new file mode 100644
index 00000000000..80e6357e3e4
--- /dev/null
+++ b/db/schema_migrations/20230403145705
@@ -0,0 +1 @@
+856d50399914b6df0c07d328723197a57806c0883157cbfe67f0c578708a1bde
\ No newline at end of file
diff --git a/db/schema_migrations/20230406134436 b/db/schema_migrations/20230406134436
new file mode 100644
index 00000000000..17d51bba6ce
--- /dev/null
+++ b/db/schema_migrations/20230406134436
@@ -0,0 +1 @@
+3b7a512959c9d109ee4b454693ebfafed624869c82fa64d92b3f780165e91feb
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index b6e93ad1f95..d0bf9a5e91a 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -11749,6 +11749,7 @@ CREATE TABLE application_settings (
     encrypted_openai_api_key_iv bytea,
     database_max_running_batched_background_migrations integer DEFAULT 2 NOT NULL,
     silent_mode_enabled boolean DEFAULT false NOT NULL,
+    package_metadata_purl_types smallint[] DEFAULT '{}'::smallint[],
     CONSTRAINT app_settings_container_reg_cleanup_tags_max_list_size_positive CHECK ((container_registry_cleanup_tags_service_max_list_size >= 0)),
     CONSTRAINT app_settings_container_registry_pre_import_tags_rate_positive CHECK ((container_registry_pre_import_tags_rate >= (0)::numeric)),
     CONSTRAINT app_settings_dep_proxy_ttl_policies_worker_capacity_positive CHECK ((dependency_proxy_ttl_group_policy_worker_capacity >= 0)),
@@ -23373,6 +23374,7 @@ CREATE TABLE user_preferences (
     use_new_navigation boolean,
     achievements_enabled boolean DEFAULT true NOT NULL,
     pinned_nav_items jsonb DEFAULT '{}'::jsonb NOT NULL,
+    pass_user_identities_to_ci_jwt boolean DEFAULT false NOT NULL,
     CONSTRAINT check_89bf269f41 CHECK ((char_length(diffs_deletion_color) <= 7)),
     CONSTRAINT check_d07ccd35f7 CHECK ((char_length(diffs_addition_color) <= 7))
 );