Add latest changes from gitlab-org/gitlab@master

2 files changed, 13 insertions, 1 deletions

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 00000000000..0b123bc9d72
--- /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 33724ef59b5..36f15e000f7 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"
@@ -3689,6 +3689,7 @@ ActiveRecord::Schema.define(version: 2020_02_14_034836) do
     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