Add latest changes from gitlab-org/gitlab@master

5 files changed, 29 insertions, 1 deletions

diff --git a/db/migrate/20230710200434_add_emoji_events_to_web_hooks.rb b/db/migrate/20230710200434_add_emoji_events_to_web_hooks.rb
new file mode 100644
index 00000000000..45a6d15cefb
--- /dev/null
+++ b/db/migrate/20230710200434_add_emoji_events_to_web_hooks.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddEmojiEventsToWebHooks < Gitlab::Database::Migration[2.1]
+  enable_lock_retries!
+
+  def change
+    add_column :web_hooks, :emoji_events, :boolean, null: false, default: false
+  end
+end
diff --git a/db/post_migrate/20230707220646_add_index_to_vulnerability_findings_on_uuid_again.rb b/db/post_migrate/20230707220646_add_index_to_vulnerability_findings_on_uuid_again.rb
new file mode 100644
index 00000000000..06d0117d50e
--- /dev/null
+++ b/db/post_migrate/20230707220646_add_index_to_vulnerability_findings_on_uuid_again.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class AddIndexToVulnerabilityFindingsOnUuidAgain < Gitlab::Database::Migration[2.1]
+  INDEX_NAME = 'index_vuln_findings_on_uuid_including_vuln_id'
+
+  def up
+    Gitlab::Database::AsyncIndexes::PostgresAsyncIndex.where(name: INDEX_NAME).find_each do |record|
+      record.definition = record.definition.strip
+      record.save!
+    end
+  end
+
+  def down
+    # no-op
+  end
+end
diff --git a/db/schema_migrations/20230707220646 b/db/schema_migrations/20230707220646
new file mode 100644
index 00000000000..7577fce9131
--- /dev/null
+++ b/db/schema_migrations/20230707220646
@@ -0,0 +1 @@
+6f801df7ed92d70e6f603d36b8c23c4e133e09b05040f848ca8d71581b8a793f
\ No newline at end of file
diff --git a/db/schema_migrations/20230710200434 b/db/schema_migrations/20230710200434
new file mode 100644
index 00000000000..25bedb60700
--- /dev/null
+++ b/db/schema_migrations/20230710200434
@@ -0,0 +1 @@
+a2ee4cf351b3befa61e6631d6e7131f01c00cb45dcc96968840e809d9b32fae0
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 7db5bfbca1e..0798515b5f4 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -24658,7 +24658,8 @@ CREATE TABLE web_hooks (
     encrypted_url_variables bytea,
     encrypted_url_variables_iv bytea,
     integration_id integer,
-    branch_filter_strategy smallint DEFAULT 0 NOT NULL
+    branch_filter_strategy smallint DEFAULT 0 NOT NULL,
+    emoji_events boolean DEFAULT false NOT NULL
 );
 
 CREATE SEQUENCE web_hooks_id_seq