diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-07-06 14:36:39 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2016-07-08 15:53:17 +0300 |
| commit | 90a6be190feea0966e9ed9b6731d930bcff32d68 (patch) | |
| tree | c653fca853b4edfccdb078deca56f652f7b2768a /app/views/projects/diffs/_file.html.haml | |
| parent | b8d3016abbfeaa0658216a9d21138435f2379e38 (diff) | |
Ensure only renderable text diffs are collapsed
Other diffs (those that are too large to render anyway, image diffs,
diffs suppressed by .gitattributes) should be rendered immediately.
Diffstat (limited to 'app/views/projects/diffs/_file.html.haml')
| -rw-r--r-- | app/views/projects/diffs/_file.html.haml | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/app/views/projects/diffs/_file.html.haml b/app/views/projects/diffs/_file.html.haml index c83ed55efe1..c306909fb1a 100644 --- a/app/views/projects/diffs/_file.html.haml +++ b/app/views/projects/diffs/_file.html.haml @@ -16,9 +16,4 @@ = view_file_btn(diff_commit.id, diff_file, project) - - if diff_file.collapsed_by_default? - - url = url_for(params.merge(action: :diff_for_path, path: diff_file.file_path, format: nil)) - .diff-content.diff-wrap-lines{data: { diff_for_path: url }} - .nothing-here-block File hidden by default; content for this element available at #{url} - - else - = render 'projects/diffs/content', diff_file: diff_file, diff_commit: diff_commit, diff_refs: diff_refs, blob: blob, project: project + = render 'projects/diffs/content', diff_file: diff_file, diff_commit: diff_commit, diff_refs: diff_refs, blob: blob, project: project |