-
- Downloads
There was a problem fetching the pipeline summary.
Merge branch 'merge-request-deleted-file' into 'master'
Correctly find last known blob for file deleted in MR. Fixes #3092. When building a new MR, `@merge_request.commits.last` would fail because this delegates to `merge_request_diff` which is still `nil` at that point. I fixed that, and changed some of the logic because showing deleted blob contents didn't previously work for the Compare page, and the UI would show the wrong commit sha for "View File @...". See merge request !1647
Showing
- app/controllers/projects/compare_controller.rb 2 additions, 1 deletionapp/controllers/projects/compare_controller.rb
- app/controllers/projects/merge_requests_controller.rb 4 additions, 1 deletionapp/controllers/projects/merge_requests_controller.rb
- app/helpers/diff_helper.rb 2 additions, 1 deletionapp/helpers/diff_helper.rb
- app/models/commit.rb 8 additions, 4 deletionsapp/models/commit.rb
- app/models/merge_request.rb 13 additions, 1 deletionapp/models/merge_request.rb
- app/models/merge_request_diff.rb 4 additions, 0 deletionsapp/models/merge_request_diff.rb
- app/models/repository.rb 1 addition, 7 deletionsapp/models/repository.rb
- app/views/projects/diffs/_diffs.html.haml 2 additions, 2 deletionsapp/views/projects/diffs/_diffs.html.haml
- app/views/projects/diffs/_file.html.haml 2 additions, 2 deletionsapp/views/projects/diffs/_file.html.haml
Loading