Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42

1 files changed, 20 insertions, 0 deletions

diff --git a/db/migrate/20210705124128_add_project_settings_previous_default_branch.rb b/db/migrate/20210705124128_add_project_settings_previous_default_branch.rb
new file mode 100644
index 00000000000..e54d762fa75
--- /dev/null
+++ b/db/migrate/20210705124128_add_project_settings_previous_default_branch.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class AddProjectSettingsPreviousDefaultBranch < ActiveRecord::Migration[6.1]
+  include Gitlab::Database::MigrationHelpers
+
+  # rubocop:disable Migration/AddLimitToTextColumns
+  # limit is added in 20210707173645_add_project_settings_previous_default_branch_text_limit
+  def up
+    with_lock_retries do
+      add_column :project_settings, :previous_default_branch, :text
+    end
+  end
+  # rubocop:enable Migration/AddLimitToTextColumns
+
+  def down
+    with_lock_retries do
+      remove_column :project_settings, :previous_default_branch
+    end
+  end
+end