Add latest changes from gitlab-org/gitlab@master

5 files changed, 30 insertions, 1 deletions

diff --git a/db/migrate/20230601090722_add_status_message_to_packages.rb b/db/migrate/20230601090722_add_status_message_to_packages.rb
new file mode 100644
index 00000000000..0486bf4c9b2
--- /dev/null
+++ b/db/migrate/20230601090722_add_status_message_to_packages.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class AddStatusMessageToPackages < Gitlab::Database::Migration[2.1]
+  # rubocop:disable Migration/AddLimitToTextColumns
+  # limit is added in 20230601153401_add_text_limit_to_packages_status_message
+  def change
+    add_column :packages_packages, :status_message, :text
+  end
+  # rubocop:enable Migration/AddLimitToTextColumns
+end
diff --git a/db/migrate/20230601153401_add_text_limit_to_packages_status_message.rb b/db/migrate/20230601153401_add_text_limit_to_packages_status_message.rb
new file mode 100644
index 00000000000..baaf8d37ab6
--- /dev/null
+++ b/db/migrate/20230601153401_add_text_limit_to_packages_status_message.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class AddTextLimitToPackagesStatusMessage < Gitlab::Database::Migration[2.1]
+  disable_ddl_transaction!
+
+  def up
+    add_text_limit :packages_packages, :status_message, 255, validate: false
+  end
+
+  def down
+    remove_text_limit :packages_packages, :status_message
+  end
+end
diff --git a/db/schema_migrations/20230601090722 b/db/schema_migrations/20230601090722
new file mode 100644
index 00000000000..300471f2dcf
--- /dev/null
+++ b/db/schema_migrations/20230601090722
@@ -0,0 +1 @@
+9d8025f9cc8b9432e5ccc872bbf9ba42bdb60d64af4a787cc1c90e465b452085
\ No newline at end of file
diff --git a/db/schema_migrations/20230601153401 b/db/schema_migrations/20230601153401
new file mode 100644
index 00000000000..cbad2334e77
--- /dev/null
+++ b/db/schema_migrations/20230601153401
@@ -0,0 +1 @@
+39012bb1ee3985c8b2ca495f799db8f9a60e137f3d503f7721396ac78237a038
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 4f561963c78..1e0d381b7e4 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -19948,7 +19948,8 @@ CREATE TABLE packages_packages (
     package_type smallint NOT NULL,
     creator_id integer,
     status smallint DEFAULT 0 NOT NULL,
-    last_downloaded_at timestamp with time zone
+    last_downloaded_at timestamp with time zone,
+    status_message text
 );
 
 CREATE SEQUENCE packages_packages_id_seq
@@ -27044,6 +27045,9 @@ ALTER TABLE sprints
 ALTER TABLE group_import_states
     ADD CONSTRAINT check_cda75c7c3f CHECK ((user_id IS NOT NULL)) NOT VALID;
 
+ALTER TABLE packages_packages
+    ADD CONSTRAINT check_d6301aedeb CHECK ((char_length(status_message) <= 255)) NOT VALID;
+
 ALTER TABLE sprints
     ADD CONSTRAINT check_df3816aed7 CHECK ((due_date IS NOT NULL)) NOT VALID;