home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 03:56:05 +10:00
Code Issues Packages Projects Releases Wiki Activity

We need sha reference from diff_base_commit to generate the diff

Browse Source
This commit is contained in:
Gabriel Mazetto
2016-03-29 23:59:51 -03:00
parent a9b2a2744c
commit 11865ee267
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/models/merge_request.rb
+2 -2
View File
@@ -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