summaryrefslogtreecommitdiff
path: root/lib/gitlab/import_export
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2017-11-07 14:25:35 +0100
committerJames Lopez <james@jameslopez.es>2017-11-07 14:25:35 +0100
commit179b8178bd54362873def1db666a5d9ae605dca5 (patch)
treef5b01ad52f01667865b712cfd517b945ee82c6d8 /lib/gitlab/import_export
parent4338823416791c6039ce89069a1a91fd84f042b5 (diff)
downloadgitlab-ce-179b8178bd54362873def1db666a5d9ae605dca5.tar.gz
Fix arguments error on Import/Export fetch_ref method
Added unit test and updated integration spec to test for this as well.
Diffstat (limited to 'lib/gitlab/import_export')
-rw-r--r--lib/gitlab/import_export/merge_request_parser.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/import_export/merge_request_parser.rb b/lib/gitlab/import_export/merge_request_parser.rb
index 81a213e8321..3e842cd2919 100644
--- a/lib/gitlab/import_export/merge_request_parser.rb
+++ b/lib/gitlab/import_export/merge_request_parser.rb
@@ -26,7 +26,7 @@ module Gitlab
end
def fetch_ref
- @project.repository.fetch_ref(@project.repository.path, @diff_head_sha, @merge_request.source_branch)
+ @project.repository.fetch_ref(@project.repository.path, source_ref: @diff_head_sha, target_ref: @merge_request.source_branch)
end
def branch_exists?(branch_name)