diff options
| author | Sam Rose <sam@gitlab.com> | 2016-12-27 12:03:44 -0500 |
|---|---|---|
| committer | Sam Rose <sam@gitlab.com> | 2016-12-31 08:00:40 -0500 |
| commit | 139ff5783b2eb2ff4b63a2f6c30695830a3984ff (patch) | |
| tree | fe2d6384516cd64de01c78c9eae0a776b371175a /app/controllers/projects/merge_requests_controller.rb | |
| parent | 8dc2163ce580f1d71be1cf45e5dfcb2b4763d7bb (diff) | |
| download | gitlab-ce-139ff5783b2eb2ff4b63a2f6c30695830a3984ff.tar.gz | |
Preserve selected versions when comparing MR changes25836-changing-from-version-in-diff-comparison-does-not-preserve-to-version
Diffstat (limited to 'app/controllers/projects/merge_requests_controller.rb')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index fc8a289d49d..6004e7d7115 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -98,7 +98,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController @start_version = @comparable_diffs.find { |diff| diff.head_commit_sha == @start_sha } unless @start_version - render_404 + @start_sha = @merge_request_diff.head_commit_sha + @start_version = @merge_request_diff end end |