diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-08 17:19:52 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-08 17:19:52 +0300 |
| commit | 51ed5225adf4aac3ccbf715f8647258dac784abb (patch) | |
| tree | 16137752ed3ea1ffd8c5398ceb131868dc2105d1 /app/views/projects/diffs/_file.html.haml | |
| parent | f5430e48b42227f1c1874ca27c6907f0f704be28 (diff) | |
| parent | 6245be083d985df3dd5daebb78ecf300bacff7b6 (diff) | |
Merge branch 'serve_lfs_object' into 'master'
Serve LFS object
Depends on gitlab-org/gitlab_git!57
See merge request !1976
Diffstat (limited to 'app/views/projects/diffs/_file.html.haml')
| -rw-r--r-- | app/views/projects/diffs/_file.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/diffs/_file.html.haml b/app/views/projects/diffs/_file.html.haml index b77e9f9f403..327e7d9245a 100644 --- a/app/views/projects/diffs/_file.html.haml +++ b/app/views/projects/diffs/_file.html.haml @@ -24,7 +24,7 @@ = "#{diff_file.diff.a_mode} → #{diff_file.diff.b_mode}" .diff-controls - - if blob.text? + - if blob_viewable?(blob) = link_to '#', class: 'js-toggle-diff-comments btn btn-sm active has_tooltip', title: "Toggle comments for this file" do %i.fa.fa-comments @@ -39,7 +39,7 @@ .diff-content.diff-wrap-lines -# Skipp all non non-supported blobs - return unless blob.respond_to?('text?') - - if blob.text? + - if blob_viewable?(blob) - if diff_view == 'parallel' = render "projects/diffs/parallel_view", diff_file: diff_file, project: project, blob: blob, index: i - else |