lib/gitlab/diff · v10.3.8 · Forest Godfrey / gitlab-ce

authored Jan 04, 2018

Merge branch '41468-error-500-trying-to-view-a-merge-request-json-undefined-method-binary-for-nil-nilclass' into 'master'

Resolve "Error 500 trying to view a merge request JSON: undefined method `binary?' for nil:NilClass"

Closes #41468

See merge request gitlab-org/gitlab-ce!16193

(cherry picked from commit 016a2b6e)

528b5eeb Fix error when viewing diffs without blobs

873f6320

Name	Last commit	Last update
..
file_collection		Loading commit data...
formatters		Loading commit data...
diff_refs.rb		Loading commit data...
file.rb		Loading commit data...
highlight.rb		Loading commit data...
image_point.rb		Loading commit data...
inline_diff.rb		Loading commit data...
inline_diff_markdown_marker.rb		Loading commit data...
inline_diff_marker.rb		Loading commit data...
line.rb		Loading commit data...
line_mapper.rb		Loading commit data...
parallel_diff.rb		Loading commit data...
parser.rb		Loading commit data...
position.rb		Loading commit data...
position_tracer.rb		Loading commit data...