Add latest changes from gitlab-org/gitlab@master

2 files changed, 20 insertions, 1 deletions

diff --git a/db/post_migrate/20200211152410_remove_instance_from_services.rb b/db/post_migrate/20200211152410_remove_instance_from_services.rb
new file mode 100644
index 00000000000..1f27455b541
--- /dev/null
+++ b/db/post_migrate/20200211152410_remove_instance_from_services.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class RemoveInstanceFromServices < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def up
+    return unless column_exists?(:services, :instance)
+
+    undo_rename_column_concurrently :services, :template, :instance
+  end
+
+  def down
+    # This migration should not be rolled back because it
+    # removes a column that got added in migrations that
+    # have been reverted in https://gitlab.com/gitlab-org/gitlab/-/merge_requests/24857
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index ecc4870b33d..162964f25e8 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_07_151640) do
+ActiveRecord::Schema.define(version: 2020_02_11_152410) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_trgm"