From 5f92e4eaf946550313933a4b60bcbf6149acbff0 Mon Sep 17 00:00:00 2001
From: Valery Sizov <valery@gitlab.com>
Date: Tue, 3 Oct 2017 12:27:04 +0300
Subject: [PATCH] [CE-EE] Fix conflicts resolvation

---
 spec/lib/gitlab/workhorse_spec.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spec/lib/gitlab/workhorse_spec.rb b/spec/lib/gitlab/workhorse_spec.rb
index 7ba16652d56..72496e9a212 100644
--- 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}"
         }
-- 
2.30.9