Commit acb4106c authored by LUKE BENNETT's avatar LUKE BENNETT

Resolve namespace_spec.rb

parent cfd2801e
...@@ -254,7 +254,6 @@ describe Namespace do ...@@ -254,7 +254,6 @@ describe Namespace do
expect(hashed_project_in_subgroup.repo.config['gitlab.fullpath']).to eq "mygroup_new/mysubgroup/#{hashed_project_in_subgroup.path}" expect(hashed_project_in_subgroup.repo.config['gitlab.fullpath']).to eq "mygroup_new/mysubgroup/#{hashed_project_in_subgroup.path}"
expect(legacy_project_in_subgroup.repo.config['gitlab.fullpath']).to eq "mygroup_new/mysubgroup/#{legacy_project_in_subgroup.path}" expect(legacy_project_in_subgroup.repo.config['gitlab.fullpath']).to eq "mygroup_new/mysubgroup/#{legacy_project_in_subgroup.path}"
end end
<<<<<<< HEAD
end end
describe '#actual_size_limit' do describe '#actual_size_limit' do
...@@ -267,8 +266,6 @@ describe Namespace do ...@@ -267,8 +266,6 @@ describe Namespace do
it 'returns the correct size limit' do it 'returns the correct size limit' do
expect(namespace.actual_size_limit).to eq(50) expect(namespace.actual_size_limit).to eq(50)
end end
=======
>>>>>>> upstream/master
end end
describe '#rm_dir', 'callback' do describe '#rm_dir', 'callback' 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