Merge branch 'tc-fix-master' into 'master'

Make some Geo migration specs more stable

Closes #9503

See merge request gitlab-org/gitlab-ee!9359

ee/spec/migrations/drop_repository_storage_events_for_geo_events_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('ee', 'db', 'post_migrate', '20180417102933_drop_repository_storage_events_for_geo_events.rb')
 
-describe DropRepositoryStorageEventsForGeoEvents, :migration do
+describe DropRepositoryStorageEventsForGeoEvents, :migration, schema: 20180416112831 do
   describe '#up' do
     before do
       schema_migrate_up!

ee/spec/migrations/schedule_prune_orphaned_geo_events_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require Rails.root.join('ee', 'db', 'post_migrate', '20180618193715_schedule_prune_orphaned_geo_events.rb')
 
-describe SchedulePruneOrphanedGeoEvents, :migration do
+describe SchedulePruneOrphanedGeoEvents, :migration, schema: 20180615152524 do
   describe '#up' do
     it 'delegates work to Gitlab::BackgroundMigration::PruneOrphanedGeoEvents', :postgresql do
       expect(BackgroundMigrationWorker).to receive(:perform_async).with('PruneOrphanedGeoEvents')