diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-10 16:06:32 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-10 16:06:32 +0000 |
| commit | e31ba68732d1e5f30cec973d93dcea75a283b81b (patch) | |
| tree | ed75c6ae1b63a7722ad54440bd5ce195af1ed004 | |
| parent | e1bd883c64231276c640169f726ddac1755a7cd1 (diff) | |
| parent | 11eec88d97b206d0bcb75d81d5910469f0de6c87 (diff) | |
| download | gitlab-ce-e31ba68732d1e5f30cec973d93dcea75a283b81b.tar.gz | |
Merge branch 'wrap_by_default_for_parallel' into 'master'
Wrap by default for parallel
Fixes #1566
See merge request !1080
| -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] |