From 63f63d8835603596447d7e85767d36bb5e1593d6 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Thu, 20 Feb 2020 12:32:57 -0600
Subject: [PATCH] Add keep_divergent_refs to remote_mirrors table

---
 .../unreleased/rs-keep-divergent-refs-column.yml      |  5 +++++
 db/migrate/20200220180944_add_keep_divergent_refs.rb  | 11 +++++++++++
 db/schema.rb                                          |  3 ++-
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/unreleased/rs-keep-divergent-refs-column.yml
 create mode 100644 db/migrate/20200220180944_add_keep_divergent_refs.rb

diff --git a/changelogs/unreleased/rs-keep-divergent-refs-column.yml b/changelogs/unreleased/rs-keep-divergent-refs-column.yml
new file mode 100644
index 00000000000000..b6d83fbc16a0ee
--- /dev/null
+++ b/changelogs/unreleased/rs-keep-divergent-refs-column.yml
@@ -0,0 +1,5 @@
+---
+title: Add keep_divergent_refs to remote_mirrors table
+merge_request:
+author:
+type: other
diff --git a/db/migrate/20200220180944_add_keep_divergent_refs.rb b/db/migrate/20200220180944_add_keep_divergent_refs.rb
new file mode 100644
index 00000000000000..0b123bc9d72876
--- /dev/null
+++ b/db/migrate/20200220180944_add_keep_divergent_refs.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class AddKeepDivergentRefs < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def change
+    add_column :remote_mirrors, :keep_divergent_refs, :boolean
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 9d3ba5f3645b31..0c576700044234 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_02_14_034836) do
+ActiveRecord::Schema.define(version: 2020_02_20_180944) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_trgm"
@@ -3687,6 +3687,7 @@
     t.boolean "only_protected_branches", default: false, null: false
     t.string "remote_name"
     t.boolean "error_notification_sent"
+    t.boolean "keep_divergent_refs"
     t.index ["last_successful_update_at"], name: "index_remote_mirrors_on_last_successful_update_at"
     t.index ["project_id"], name: "index_remote_mirrors_on_project_id"
   end
-- 
GitLab