Commit f3c42e3f authored by Bob Van Landuyt's avatar Bob Van Landuyt

Fix conflicts in `populate_fork_networks_range_spec`

parent ba5a4de3
......@@ -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
......
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