Merge branch 'ce-to-ee' of https://gitlab.com/gitlab-org/gitlab-ee into ce-to-ee

spec/lib/gitlab/background_migration/populate_fork_networks_range_spec.rb

@@ -80,15 +80,11 @@ describe Gitlab::BackgroundMigration::PopulateForkNetworksRange, :migration, sch
   end
 
   it 'only processes a single batch of links at a time' do
-<<<<<<< HEAD
-    expect(fork_network_members.count).to eq(5)
-=======
     expect(fork_networks.count).to eq(2)
 
     migration.perform(3, 5)
 
     expect(fork_networks.count).to eq(3)
->>>>>>> ce-com/master
   end
 
   it 'can be repeated without effect' do