projects

Merge branch 'merge-request-deleted-file' into 'master'

Dmitriy Zaporozhets authored 9 years ago

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

f16bfa40

History

f16bfa40 9 years ago

History

Code owners

Assign users and groups as approvers for specific file changes. Learn more.

Name	Last commit	Last update
..
application_controller.rb
avatars_controller.rb
blame_controller.rb
blob_controller.rb
branches_controller.rb
builds_controller.rb
ci_services_controller.rb
ci_settings_controller.rb
ci_web_hooks_controller.rb
commit_controller.rb
commits_controller.rb
compare_controller.rb
deploy_keys_controller.rb
forks_controller.rb
graphs_controller.rb
hooks_controller.rb
imports_controller.rb
issues_controller.rb
labels_controller.rb
merge_requests_controller.rb
milestones_controller.rb
network_controller.rb
notes_controller.rb
project_members_controller.rb
protected_branches_controller.rb
raw_controller.rb
refs_controller.rb
repositories_controller.rb
runners_controller.rb
services_controller.rb
snippets_controller.rb
tags_controller.rb
tree_controller.rb
triggers_controller.rb
uploads_controller.rb
variables_controller.rb
wikis_controller.rb

Admin message

Admin message

projects