From 11865ee267894f340a9d3f46cd6e64b671ad96e4 Mon Sep 17 00:00:00 2001 From: Gabriel Mazetto Date: Tue, 29 Mar 2016 22:57:21 -0300 Subject: [PATCH] We need `sha` reference from `diff_base_commit` to generate the diff --- app/models/merge_request.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index b12a878327..1245cc16d6 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -332,14 +332,14 @@ class MergeRequest < ActiveRecord::Base # # see "git diff" def to_diff - target_project.repository.diff_text(diff_base_commit, source_sha) + target_project.repository.diff_text(diff_base_commit.sha, source_sha) end # Returns the commit as a series of email patches. # # see "git format-patch" def to_patch - target_project.repository.format_patch(diff_base_commit, source_sha) + target_project.repository.format_patch(diff_base_commit.sha, source_sha) end def hook_attrs