diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-08 16:14:56 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-08 16:14:56 +0000 |
| commit | e9002222a0fc65e4e3328c7c536e43516986eb40 (patch) | |
| tree | 8f36da7826e9d4f91ba726cdd96ce02ef8367347 /app | |
| parent | 9ea883fb5d02608010db858237cbd4926ae99650 (diff) | |
| parent | ffbbd4112eb5a0a927925e70644128bf25145414 (diff) | |
| download | gitlab-ce-e9002222a0fc65e4e3328c7c536e43516986eb40.tar.gz | |
Merge branch 'dm-diff-file-diffable' into 'master'
Move diffable? method from Repository to Diff::File
See merge request !11980
Diffstat (limited to 'app')
| -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 59844bc00cd..ec1c434a4b8 100644 --- a/app/views/projects/diffs/_content.html.haml +++ b/app/views/projects/diffs/_content.html.haml @@ -6,7 +6,7 @@ - elsif blob.truncated? .nothing-here-block The file could not be displayed because it is too large. - elsif blob.readable_text? - - if !diff_file.repository.diffable?(blob) + - if !diff_file.diffable? .nothing-here-block This diff was suppressed by a .gitattributes entry. - elsif diff_file.collapsed? - url = url_for(params.merge(action: :diff_for_path, old_path: diff_file.old_path, new_path: diff_file.new_path, file_identifier: diff_file.file_identifier)) |