[CE-EE] Fix conflicts resolvation

5f92e4ea · Valery Sizov · 5340ff29 · 5f92e4ea
Commit 5f92e4ea authored Oct 03, 2017 by Valery Sizov
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

spec/lib/gitlab/workhorse_spec.rb spec/lib/gitlab/workhorse_spec.rb +0 -1

No files found.
--- a/spec/lib/gitlab/workhorse_spec.rb
+++ b/spec/lib/gitlab/workhorse_spec.rb
@@ -226,7 +226,6 @@ describe Gitlab::Workhorse do
      it 'includes a Repository param' do
        repo_param = {
          storage_name: 'default',
-          relative_path: project.full_path + '.git'
          relative_path: project.full_path + '.git',
          gl_repository: "project-#{project.id}"
        }