Merge request fails with NoMethodError on Gitlab 8

After updating to 8.0.2 from 7.14, I'm getting this error trying to submit a merge request on one project:

NoMethodError (undefined method `[]' for #<Gitlab::Git::Diff:0x0000000ddf78e0>): app/models/merge_request_diff.rb:126:in `reload_diffs' app/models/merge_request_diff.rb:43:in `reload_content' app/services/merge_requests/create_service.rb:17:in `execute' app/controllers/projects/merge_requests_controller.rb:106:in `create'

I think this is a duplicate of #2692 (closed) and should be fixed via a44ca15c. This should be in GitLab 8.0.3, which should be released soon.

Status changed to closed

mentioned in merge request !14785