diff options
author | Robert Speicher <robert@gitlab.com> | 2016-03-30 16:02:19 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-03-30 16:02:19 +0000 |
commit | 3d4848615c6f6e3fc9ba51a71c5671bd39bf2fe1 (patch) | |
tree | c35f4a35cdcb0410fc302fed0a7ca8f8e5d14353 | |
parent | 489165e3438c8f0fbbdb4bb0f08f2406f7cafb0c (diff) | |
parent | 808bcf5bc616af4d57011df1e37675069319e7c5 (diff) | |
download | gitlab-ce-3d4848615c6f6e3fc9ba51a71c5671bd39bf2fe1.tar.gz |
Merge branch 'patch/fix-mergerequest-diff' into 'master'
Fix Raw / Rendered diff producing different results on merge requests
The raw diff endpoint (`merge_requests/####.diff`) produces a diff based on `target_branch` instead of the original branching point. Same is valid for `merge_requests/####.patch`.
Fixes #14680, #3017
See merge request !3450
-rw-r--r-- | CHANGELOG | 1 | ||||
-rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 4 | ||||
-rw-r--r-- | app/models/merge_request.rb | 8 | ||||
-rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 2 |
4 files changed, 8 insertions, 7 deletions
diff --git a/CHANGELOG b/CHANGELOG index 91935ad068c..1698fd8f5b7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,6 +7,7 @@ v 8.7.0 (unreleased) - Expose label description in API (Mariusz Jachimowicz) - Allow back dating on issues when created through the API - Fix avatar stretching by providing a cropping feature + - Fix raw/rendered diff producing different results on merge requests !3450 - Add links to CI setup documentation from project settings and builds pages - Handle nil descriptions in Slack issue messages (Stan Hu) - Implement 'Groups View' as an option for dashboard preferences !3379 (Elias W.) diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 0b0ad984eb4..62451ac73a9 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -57,8 +57,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController respond_to do |format| format.html format.json { render json: @merge_request } - format.diff { render text: @merge_request.to_diff(current_user) } - format.patch { render text: @merge_request.to_patch(current_user) } + format.diff { render text: @merge_request.to_diff } + format.patch { render text: @merge_request.to_patch } end end diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 7c61a7ae18c..1245cc16d6a 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -331,15 +331,15 @@ class MergeRequest < ActiveRecord::Base # Returns the raw diff for this merge request # # see "git diff" - def to_diff(current_user) - target_project.repository.diff_text(target_branch, source_sha) + 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" - def to_patch(current_user) - target_project.repository.format_patch(target_branch, source_sha) + def to_patch + target_project.repository.format_patch(diff_base_commit.sha, source_sha) end def hook_attrs diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index c5b034dc064..75e6b6f45a7 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -63,7 +63,7 @@ describe Projects::MergeRequestsController do id: merge_request.iid, format: format) - expect(response.body).to eq((merge_request.send(:"to_#{format}",user)).to_s) + expect(response.body).to eq((merge_request.send(:"to_#{format}")).to_s) end it "should not escape Html" do |