diff options
| author | Marin Jankovski <marin@gitlab.com> | 2014-09-10 16:46:10 +0200 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2014-09-10 16:46:10 +0200 |
| commit | 11eec88d97b206d0bcb75d81d5910469f0de6c87 (patch) | |
| tree | 5f09bd0e58ddb0cfb46157daf0d5d02e42d1371f /app | |
| parent | 83e5211a1d3036d773a816f82b0fbd59e21e561d (diff) | |
| download | gitlab-ce-11eec88d97b206d0bcb75d81d5910469f0de6c87.tar.gz | |
Wrap should always be enabled for parallel diff.
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/diffs/_file.html.haml | 7 | ||||
| -rw-r--r-- | app/views/projects/diffs/_parallel_view.html.haml | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/app/views/projects/diffs/_file.html.haml b/app/views/projects/diffs/_file.html.haml index be0301e75f8..f2a8d148cc6 100644 --- a/app/views/projects/diffs/_file.html.haml +++ b/app/views/projects/diffs/_file.html.haml @@ -15,9 +15,10 @@ %span.file-mode= "#{diff.a_mode} → #{diff.b_mode}" .diff-btn-group - %label - = check_box_tag nil, 1, false, class: "js-toggle-diff-line-wrap" - Wrap text + - unless params[:view] == 'parallel' + %label + = check_box_tag nil, 1, false, class: "js-toggle-diff-line-wrap" + Wrap text = link_to "#", class: "js-toggle-diff-comments btn btn-small" do %i.icon-chevron-down diff --git a/app/views/projects/diffs/_parallel_view.html.haml b/app/views/projects/diffs/_parallel_view.html.haml index 47fe77ccf75..3ec769e0b83 100644 --- a/app/views/projects/diffs/_parallel_view.html.haml +++ b/app/views/projects/diffs/_parallel_view.html.haml @@ -1,5 +1,5 @@ / Side-by-side diff view -%div.text-file +%div.text-file.diff-wrap-lines %table - parallel_diff(diff_file, index).each do |line| - type_left = line[0] |