Commit 5f92e4ea authored by Valery Sizov's avatar Valery Sizov

[CE-EE] Fix conflicts resolvation

parent 5340ff29
...@@ -226,7 +226,6 @@ describe Gitlab::Workhorse do ...@@ -226,7 +226,6 @@ describe Gitlab::Workhorse do
it 'includes a Repository param' do it 'includes a Repository param' do
repo_param = { repo_param = {
storage_name: 'default', storage_name: 'default',
relative_path: project.full_path + '.git'
relative_path: project.full_path + '.git', relative_path: project.full_path + '.git',
gl_repository: "project-#{project.id}" gl_repository: "project-#{project.id}"
} }
......
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