Add latest changes from gitlab-org/gitlab@master

1 files changed, 17 insertions, 0 deletions

diff --git a/db/migrate/20210331125111_add_default_target_project.rb b/db/migrate/20210331125111_add_default_target_project.rb
new file mode 100644
index 00000000000..1a2c5ccca7d
--- /dev/null
+++ b/db/migrate/20210331125111_add_default_target_project.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddDefaultTargetProject < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  def up
+    with_lock_retries do
+      add_column :project_settings, :mr_default_target_self, :boolean, default: false, null: false
+    end
+  end
+
+  def down
+    with_lock_retries do
+      remove_column :project_settings, :mr_default_target_self
+    end
+  end
+end