diff options
| author | Gabriel Mazetto <gabriel@gitlab.com> | 2016-03-29 22:57:21 -0300 |
|---|---|---|
| committer | Gabriel Mazetto <gabriel@gitlab.com> | 2016-03-29 23:59:51 -0300 |
| commit | 11865ee267894f340a9d3f46cd6e64b671ad96e4 (patch) | |
| tree | d09d82c945b17f1535d8dc9769ea80a4341807a0 | |
| parent | a9b2a2744c93c848977a61ced56d66197027c0eb (diff) | |
| download | gitlab-ce-11865ee267894f340a9d3f46cd6e64b671ad96e4.tar.gz | |
We need `sha` reference from `diff_base_commit` to generate the diff
| -rw-r--r-- | app/models/merge_request.rb | 4 |
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 |