diff options
| author | Rubén Dávila <rdavila84@gmail.com> | 2016-01-14 12:56:44 -0500 |
|---|---|---|
| committer | Rubén Dávila <rdavila84@gmail.com> | 2016-01-14 16:41:10 -0500 |
| commit | 70bc322415b33a4789067b81387d30f1411c9091 (patch) | |
| tree | 80e83357558d4275794e7808d078e065f77888de | |
| parent | 8dfad143d44af4896ff6c71e8a42ad32b69ad593 (diff) | |
| download | gitlab-ce-70bc322415b33a4789067b81387d30f1411c9091.tar.gz | |
Use the adequate reference for the old rev. #3945
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 95fd62b8ace..3d792af0a48 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -59,7 +59,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController def diffs @commit = @merge_request.last_commit @first_commit = @merge_request.first_commit - @diff_refs = [@merge_request.target_sha, @merge_request.source_sha] + @diff_refs = [@merge_request.last_commit.parent_id, @merge_request.source_sha] @comments_allowed = @reply_allowed = true @comments_target = { |