Commit b37d0e6d authored by GitLab Bot's avatar GitLab Bot

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-25

# Conflicts:
#	db/migrate/20180503193542_add_indexes_to_remote_mirror.rb

[ci skip]
parents df91318a 3f14c56b
...@@ -10,7 +10,10 @@ class AddIndexesToRemoteMirror < ActiveRecord::Migration ...@@ -10,7 +10,10 @@ class AddIndexesToRemoteMirror < ActiveRecord::Migration
end end
def down def down
<<<<<<< HEAD
# ee/db/migrate/20170208144550_add_index_to_mirrors_last_update_at_fields.rb will remove the index. # ee/db/migrate/20170208144550_add_index_to_mirrors_last_update_at_fields.rb will remove the index.
=======
>>>>>>> upstream/master
# rubocop:disable Migration/RemoveIndex # rubocop:disable Migration/RemoveIndex
remove_index :remote_mirrors, :last_successful_update_at if index_exists? :remote_mirrors, :last_successful_update_at remove_index :remote_mirrors, :last_successful_update_at if index_exists? :remote_mirrors, :last_successful_update_at
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment