Merge branch '11313-broken-master-with-mysql' into 'master'

Resolve "Broken master with MySQL: ee/spec/lib/gitlab/background_migration/prune_orphaned_geo_events_spec.rb"

Closes #11313

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

ee/spec/lib/gitlab/background_migration/prune_orphaned_geo_events_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::BackgroundMigration::PruneOrphanedGeoEvents, :migration, geo: false, schema: 20180626125654 do
+describe Gitlab::BackgroundMigration::PruneOrphanedGeoEvents, :migration, :postgresql, geo: false, schema: 20180626125654 do
   let(:event_table_name) { 'geo_repository_updated_events' }
   let(:geo_event_log) { table(:geo_event_log) }
   let(:geo_updated_events) { table(event_table_name) }