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
committerLin Jen-Shin <godfat@godfat.org>2017-11-10 10:46:32 +0300
commit7ce0930dd8e52c0f4561134e66b7f0e0f9a84a61 (patch)
tree6c062804ff9f8472b89c54e1fc4aa42f553a1726 /lib
parentb0974a4f6b072cc5f2e9a707aefb7d6afefe7de3 (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)