Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42

1 files changed, 13 insertions, 0 deletions

diff --git a/db/post_migrate/20220221214928_remove_show_diff_preview_in_email_column.rb b/db/post_migrate/20220221214928_remove_show_diff_preview_in_email_column.rb
new file mode 100644
index 00000000000..41cd3446c7a
--- /dev/null
+++ b/db/post_migrate/20220221214928_remove_show_diff_preview_in_email_column.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class RemoveShowDiffPreviewInEmailColumn < Gitlab::Database::Migration[1.0]
+  enable_lock_retries!
+
+  def up
+    remove_column :project_settings, :show_diff_preview_in_email, :boolean
+  end
+
+  def down
+    add_column :project_settings, :show_diff_preview_in_email, :boolean, default: true, null: false
+  end
+end