Commit 11eec88d authored by Marin Jankovski's avatar Marin Jankovski

Wrap should always be enabled for parallel diff.

parent 83e5211a
...@@ -15,9 +15,10 @@ ...@@ -15,9 +15,10 @@
%span.file-mode= "#{diff.a_mode}#{diff.b_mode}" %span.file-mode= "#{diff.a_mode}#{diff.b_mode}"
.diff-btn-group .diff-btn-group
%label - unless params[:view] == 'parallel'
= check_box_tag nil, 1, false, class: "js-toggle-diff-line-wrap" %label
Wrap text = 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 = link_to "#", class: "js-toggle-diff-comments btn btn-small" do
%i.icon-chevron-down %i.icon-chevron-down
......
/ Side-by-side diff view / Side-by-side diff view
%div.text-file %div.text-file.diff-wrap-lines
%table %table
- parallel_diff(diff_file, index).each do |line| - parallel_diff(diff_file, index).each do |line|
- type_left = line[0] - type_left = line[0]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment