Commit dbcfbd68 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'dm-diff-too-large-error' into 'master'

Rephrase error message for a diff with a blob that’s too large

See merge request !10746
parents 8e29af5e f4da1a80
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
- if diff_file.too_large? - if diff_file.too_large?
.nothing-here-block This diff could not be displayed because it is too large. .nothing-here-block This diff could not be displayed because it is too large.
- elsif blob.only_display_raw? - elsif blob.only_display_raw?
.nothing-here-block This file is too large to display. .nothing-here-block The file could not be displayed because it is too large.
- elsif blob_text_viewable?(blob) - elsif blob_text_viewable?(blob)
- if !project.repository.diffable?(blob) - if !project.repository.diffable?(blob)
.nothing-here-block This diff was suppressed by a .gitattributes entry. .nothing-here-block This diff was suppressed by a .gitattributes entry.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment