Add latest changes from gitlab-org/gitlab@master

5 files changed, 30 insertions, 1 deletions

diff --git a/db/migrate/20231212154022_add_release_published_at_to_release.rb b/db/migrate/20231212154022_add_release_published_at_to_release.rb
new file mode 100644
index 00000000000..8ecb51a8cf1
--- /dev/null
+++ b/db/migrate/20231212154022_add_release_published_at_to_release.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class AddReleasePublishedAtToRelease < Gitlab::Database::Migration[2.2]
+  milestone '16.8'
+  enable_lock_retries!
+
+  def change
+    add_column :releases, :release_published_at, :datetime_with_timezone
+  end
+end
diff --git a/db/migrate/20231220094609_add_release_published_at_index_to_release.rb b/db/migrate/20231220094609_add_release_published_at_index_to_release.rb
new file mode 100644
index 00000000000..bc5891ad198
--- /dev/null
+++ b/db/migrate/20231220094609_add_release_published_at_index_to_release.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class AddReleasePublishedAtIndexToRelease < Gitlab::Database::Migration[2.2]
+  milestone '16.8'
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index :releases, :release_published_at, name: 'releases_published_at_index'
+  end
+
+  def down
+    remove_concurrent_index :releases, :release_published_at, name: 'releases_published_at_index'
+  end
+end
diff --git a/db/schema_migrations/20231212154022 b/db/schema_migrations/20231212154022
new file mode 100644
index 00000000000..9f9967d0326
--- /dev/null
+++ b/db/schema_migrations/20231212154022
@@ -0,0 +1 @@
+c005eb8901f1ebb85dedb044d627396f591bd760a0315dc3f45171def0f972e5
\ No newline at end of file
diff --git a/db/schema_migrations/20231220094609 b/db/schema_migrations/20231220094609
new file mode 100644
index 00000000000..30ece81d4a0
--- /dev/null
+++ b/db/schema_migrations/20231220094609
@@ -0,0 +1 @@
+aab891f39866b4933cadd8295ecaa1c9f8a256cda832b734dfb1911580187bf3
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index d754b9a0671..8d7f7c2af3c 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -22718,7 +22718,8 @@ CREATE TABLE releases (
     author_id integer,
     name character varying,
     sha character varying,
-    released_at timestamp with time zone NOT NULL
+    released_at timestamp with time zone NOT NULL,
+    release_published_at timestamp with time zone
 );
 
 CREATE SEQUENCE releases_id_seq
@@ -35392,6 +35393,8 @@ CREATE INDEX partial_index_user_id_app_id_created_at_token_not_revoked ON oauth_
 
 CREATE UNIQUE INDEX pm_checkpoints_path_components ON pm_checkpoints USING btree (purl_type, data_type, version_format);
 
+CREATE INDEX releases_published_at_index ON releases USING btree (release_published_at);
+
 CREATE INDEX scan_finding_approval_mr_rule_index_id ON approval_merge_request_rules USING btree (id) WHERE (report_type = 4);
 
 CREATE INDEX scan_finding_approval_mr_rule_index_merge_request_id ON approval_merge_request_rules USING btree (merge_request_id) WHERE (report_type = 4);