Commit e31ba687 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'wrap_by_default_for_parallel' into 'master'

Wrap by default for parallel

Fixes #1566

See merge request !1080
parents e1bd883c 11eec88d
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
%span.file-mode= "#{diff.a_mode}#{diff.b_mode}" %span.file-mode= "#{diff.a_mode}#{diff.b_mode}"
.diff-btn-group .diff-btn-group
- unless params[:view] == 'parallel'
%label %label
= check_box_tag nil, 1, false, class: "js-toggle-diff-line-wrap" = check_box_tag nil, 1, false, class: "js-toggle-diff-line-wrap"
Wrap text Wrap text
......
/ 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