diff options
| author | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2016-06-07 12:50:29 +0000 |
|---|---|---|
| committer | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2016-06-07 12:50:29 +0000 |
| commit | afa21054fae2331afcf4b3784a3ffae5657b3e5b (patch) | |
| tree | 935256b141573d1bedc9aa0bdd32062edc13a44e /app/models/merge_request.rb | |
| parent | 8c356ac5500d7f82e9afa7fa19b44aefa99edfe7 (diff) | |
| parent | d47218fb9732841956a5511afbde38ff731ab106 (diff) | |
| download | gitlab-ce-afa21054fae2331afcf4b3784a3ffae5657b3e5b.tar.gz | |
Merge branch 'zj-workhorse-to-serve-diffs' into 'master'
14722-searching-for-usernames-should-only-be-possible-for-search-strings-with-a-valid-format
Workhorse to serve raw diffs
Fixes (partially) #13999
Dependent on: gitlab-org/gitlab-workhorse!45
See merge request !4130
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 6c7668778ba..b0ed8182855 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -313,13 +313,6 @@ class MergeRequest < ActiveRecord::Base ) end - # Returns the raw diff for this merge request - # - # see "git diff" - def to_diff - 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" |