Add latest changes from gitlab-org/gitlab@master

1 files changed, 17 insertions, 3 deletions

diff --git a/db/migrate/20231123160255_add_token_to_chat_names.rb b/db/migrate/20231123160255_add_token_to_chat_names.rb
index f35a6b812f3..af8550b9020 100644
--- a/db/migrate/20231123160255_add_token_to_chat_names.rb
+++ b/db/migrate/20231123160255_add_token_to_chat_names.rb
@@ -5,8 +5,22 @@ class AddTokenToChatNames < Gitlab::Database::Migration[2.2]
 
   milestone '16.7'
 
-  def change
-    add_column :chat_names, :encrypted_token, :binary
-    add_column :chat_names, :encrypted_token_iv, :binary
+  # This migration was added as different filenames across GitLab
+  # versions in security releases:
+  #
+  # 16.8 - db/migrate/20231123160255_add_token_to_chat_names.rb
+  # 16.7 - db/migrate/20231219120134_add_token_to_chat_names.rb
+  # 16.6 - db/migrate/20231215135014_add_token_to_chat_names.rb
+  # 16.5 - db/migrate/20231215145632_add_token_to_chat_names.rb
+  #
+  # This migration needs to be idempotent to prevent upgrade failures.
+  def up
+    add_column :chat_names, :encrypted_token, :binary unless column_exists?(:chat_names, :encrypted_token)
+    add_column :chat_names, :encrypted_token_iv, :binary unless column_exists?(:chat_names, :encrypted_token_iv)
+  end
+
+  def down
+    remove_column :chat_names, :encrypted_token, :binary if column_exists?(:chat_names, :encrypted_token)
+    remove_column :chat_names, :encrypted_token_iv, :binary if column_exists?(:chat_names, :encrypted_token_iv)
   end
 end