Diff in Merge Requests with Large # of Commits not showing (500 Error)
Created by: wilsonj
Merge Requests with commits of usually 40 or more, when trying to display the diff, throws a 500 error. Plain diff works fine.
Rendered notes/_per_line_note_link.html.haml (0.1ms) Rendered notes/_per_line_note_link.html.haml (0.1ms) Rendered notes/_per_line_note_link.html.haml (0.1ms) Rendered notes/_per_line_note_link.html.haml (0.1ms) Rendered notes/_per_line_note_link.html.haml (0.1ms) Rendered notes/_per_line_note_link.html.haml (0.1ms) Rendered commits/_text_file.html.haml (6.9ms) Rendered commits/_diffs.html.haml (617.1ms) Rendered merge_requests/show/_diffs.html.haml (617.3ms) Rendered merge_requests/diffs.js.haml (617.5ms) Completed 500 Internal Server Error in 728ms
ActionView::Template::Error (undefined method lines' for nil:NilClass): 14: 15: - unless @suppress_diff 16: - diffs.each_with_index do |diff, i| 17: - next if diff.diff.empty? 18: - file = (@commit.tree / diff.new_path) 19: - file = (@commit.prev_commit.tree / diff.old_path) unless file 20: - next unless file app/views/commits/_diffs.html.haml:17:inblock in _app_views_commits__diffs_html_haml___4310458900411057741_51228800'
app/views/commits/_diffs.html.haml:16:in each' app/views/commits/_diffs.html.haml:16:ineach_with_index'
app/views/commits/_diffs.html.haml:16:in _app_views_commits__diffs_html_haml___4310458900411057741_51228800' app/views/merge_requests/show/_diffs.html.haml:2:in_app_views_merge_requests_show__diffs_html_haml___4549660255707816003_55229820'
app/views/merge_requests/diffs.js.haml:2:in `_app_views_merge_requests_diffs_js_haml___4105209467495251120_54878880'