Add latest changes from gitlab-org/gitlab@16-7-stable-eev16.7.0-rc42

1 files changed, 28 insertions, 0 deletions

diff --git a/db/post_migrate/20231127185328_fix_broken_user_achievements_revoked.rb b/db/post_migrate/20231127185328_fix_broken_user_achievements_revoked.rb
new file mode 100644
index 00000000000..548a85b8814
--- /dev/null
+++ b/db/post_migrate/20231127185328_fix_broken_user_achievements_revoked.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+class FixBrokenUserAchievementsRevoked < Gitlab::Database::Migration[2.2]
+  disable_ddl_transaction!
+  restrict_gitlab_migration gitlab_schema: :gitlab_main
+
+  milestone '16.7'
+
+  class User < MigrationRecord
+    self.table_name = 'users'
+  end
+
+  def up
+    User.reset_column_information
+
+    ghost_id = User.where(user_type: 5).first&.id
+
+    return unless ghost_id
+
+    update_column_in_batches(:user_achievements, :revoked_by_user_id, ghost_id) do |table, query|
+      query.where(table[:revoked_at].not_eq(nil)).where(table[:revoked_by_user_id].eq(nil))
+    end
+  end
+
+  def down
+    # noop -- this is a data migration and can't be reversed
+  end
+end