kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Robert Speicher 2017-04-18 00:02:20 +00:00
parent 8e29af5e33 f4da1a805f
commit dbcfbd68b6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/projects/diffs/_content.html.haml
View File

@ -4,7 +4,7 @@
- if diff_file.too_large?
.nothing-here-block This diff could not be displayed because it is too large.
- 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)
- if !project.repository.diffable?(blob)
.nothing-here-block This diff was suppressed by a .gitattributes entry.