diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-04-18 00:02:20 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-04-18 00:02:20 +0000 |
| commit | dbcfbd68b6b2b4c62ba5381317296b23002e3067 (patch) | |
| tree | 5ae30bb17d3b15a85053781a4b2031bf9472cc38 | |
| parent | 8e29af5e33d81f6f0fa68e62915fef7894187f6f (diff) | |
| parent | f4da1a805ff3f4dc5f1889b2cce19d26885120f7 (diff) | |
| download | gitlab-ce-dbcfbd68b6b2b4c62ba5381317296b23002e3067.tar.gz | |
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
| -rw-r--r-- | app/views/projects/diffs/_content.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/diffs/_content.html.haml b/app/views/projects/diffs/_content.html.haml index 5c38b5ad9c0..438a98c3e95 100644 --- a/app/views/projects/diffs/_content.html.haml +++ b/app/views/projects/diffs/_content.html.haml @@ -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. |