Add latest changes from gitlab-org/gitlab@master

2 files changed, 29 insertions, 0 deletions

diff --git a/db/migrate/20231129211524_add_project_xray_report_model.rb b/db/migrate/20231129211524_add_project_xray_report_model.rb
new file mode 100644
index 00000000000..eed1ed2c6eb
--- /dev/null
+++ b/db/migrate/20231129211524_add_project_xray_report_model.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class AddProjectXrayReportModel < Gitlab::Database::Migration[2.2]
+  enable_lock_retries!
+  milestone '16.7'
+
+  def change
+    create_table :xray_reports, if_not_exists: true do |t|
+      # we create an index manually below, don't create one here
+      t.references :project, null: false, index: false, foreign_key: { on_delete: :cascade }
+      t.timestamps_with_timezone null: false
+      t.text :lang, null: false, limit: 255
+      t.jsonb :payload, null: false
+      t.binary :file_checksum, null: false
+    end
+
+    add_index :xray_reports, [:project_id, :lang], unique: true, name: 'index_xray_reports_on_project_id_and_lang'
+  end
+end
diff --git a/db/migrate/20231206144919_add_repository_xray_plan_limit.rb b/db/migrate/20231206144919_add_repository_xray_plan_limit.rb
new file mode 100644
index 00000000000..8d276aa9100
--- /dev/null
+++ b/db/migrate/20231206144919_add_repository_xray_plan_limit.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class AddRepositoryXrayPlanLimit < Gitlab::Database::Migration[2.2]
+  enable_lock_retries!
+  milestone '16.7'
+
+  def change
+    add_column :plan_limits, :ci_max_artifact_size_repository_xray, :bigint, default: 1.gigabyte, null: false
+  end
+end