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

Resolve conflict in spec/requests/api/projects_spec.rb

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent c01ae494
...@@ -889,11 +889,8 @@ describe API::Projects do ...@@ -889,11 +889,8 @@ describe API::Projects do
expect(json_response['shared_with_groups'][0]['group_access_level']).to eq(link.group_access) expect(json_response['shared_with_groups'][0]['group_access_level']).to eq(link.group_access)
expect(json_response['only_allow_merge_if_pipeline_succeeds']).to eq(project.only_allow_merge_if_pipeline_succeeds) expect(json_response['only_allow_merge_if_pipeline_succeeds']).to eq(project.only_allow_merge_if_pipeline_succeeds)
expect(json_response['only_allow_merge_if_all_discussions_are_resolved']).to eq(project.only_allow_merge_if_all_discussions_are_resolved) expect(json_response['only_allow_merge_if_all_discussions_are_resolved']).to eq(project.only_allow_merge_if_all_discussions_are_resolved)
<<<<<<< HEAD
expect(json_response).not_to have_key('repository_storage')
=======
>>>>>>> upstream/master
expect(json_response['merge_method']).to eq(project.merge_method.to_s) expect(json_response['merge_method']).to eq(project.merge_method.to_s)
expect(json_response).not_to have_key('repository_storage')
end end
it 'returns a project by path name' do it 'returns a project by path name' 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