summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-09-06 14:29:17 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-09-06 14:29:17 +0200
commit3b9f9aa00bc0c3afb65d803c3f7071fa7a113628 (patch)
treeffd17afd5d11304fa561831ce409fba7c4a0aa45 /app/models/merge_request.rb
parentdeaa7f54e016b6ae1051c38abb95586451f470c1 (diff)
parentd1b60cbc67dc14b21820ef3f823a8e1ea851697d (diff)
downloadgitlab-ce-3b9f9aa00bc0c3afb65d803c3f7071fa7a113628.tar.gz
Merge commit 'd1b60cbc67dc14b21820ef3f823a8e1ea851697d' into feature/gb/download-single-job-artifact-using-api
* commit 'd1b60cbc67dc14b21820ef3f823a8e1ea851697d': (210 commits)
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r--app/models/merge_request.rb9
1 files changed, 1 insertions, 8 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 7a817eedec2..724fb4ccef1 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -957,13 +957,6 @@ class MergeRequest < ActiveRecord::Base
private
def write_ref
- target_project.repository.with_repo_branch_commit(
- source_project.repository, source_branch) do |commit|
- if commit
- target_project.repository.write_ref(ref_path, commit.sha)
- else
- raise Rugged::ReferenceError, 'source repository is empty'
- end
- end
+ target_project.repository.fetch_source_branch(source_project.repository, source_branch, ref_path)
end
end