Wrap should always be enabled for parallel diff.
This commit is contained in:
parent
83e5211a1d
commit
11eec88d97
2 changed files with 5 additions and 4 deletions
|
@ -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
|
||||
|
|
|
@ -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]
|
||||
|
|
Loading…
Reference in a new issue