Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-11-07 18:58:30 +0300
committerDouwe Maan <douwe@gitlab.com>2017-11-07 18:58:30 +0300
commitc8eb789b094c29645561831d798f9e75488a36df (patch)
treea4018dc80f1e8476a19ee3beff2ab46c6e977df6 /lib
parent4e00e8ed3560800bac556de4ea7f8d3274a70509 (diff)
parent9a0acc98aafaa315317b799c6a2a0a2fe5ded52e (diff)
Merge branch 'fix/import-export-arguments' into 'master'
Fix arguments error on Import/Export fetch_ref method Closes #39541 See merge request gitlab-org/gitlab-ce!15241
Diffstat (limited to 'lib')
-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..61db4bd9ccc 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, source_ref: @diff_head_sha, target_ref: @merge_request.source_branch)
end
def branch_exists?(branch_name)