Commit 0fd47563 authored by Rémy Coutable's avatar Rémy Coutable

Fix conflict in spec/models/project_spec.rb

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent b815dc9b
...@@ -948,8 +948,8 @@ describe Project, models: true do ...@@ -948,8 +948,8 @@ describe Project, models: true do
it 'creates a correct avatar path' do it 'creates a correct avatar path' do
avatar_path = "/uploads/project/avatar/#{project.id}/dk.png" avatar_path = "/uploads/project/avatar/#{project.id}/dk.png"
<<<<<<< HEAD expect(project.avatar_url).to eq("http://#{Gitlab.config.gitlab.host}#{avatar_path}")
it { should eq "http://#{Gitlab.config.gitlab.host}#{avatar_path}" } end
context 'When in a geo secondary node' do context 'When in a geo secondary node' do
let(:geo_url) { 'http://geo.example.com' } let(:geo_url) { 'http://geo.example.com' }
...@@ -960,9 +960,6 @@ describe Project, models: true do ...@@ -960,9 +960,6 @@ describe Project, models: true do
end end
it { should eq "#{geo_url}#{avatar_path}" } it { should eq "#{geo_url}#{avatar_path}" }
=======
expect(project.avatar_url).to eq("http://#{Gitlab.config.gitlab.host}#{avatar_path}")
>>>>>>> ce-com/master
end end
end end
......
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