summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/models/merge_request.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index b12a878327d..1245cc16d6a 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