diff --git a/app/views/common/_diff.html.erb b/app/views/common/_diff.html.erb index 35dfdea283..f54bdfa4ca 100644 --- a/app/views/common/_diff.html.erb +++ b/app/views/common/_diff.html.erb @@ -6,7 +6,7 @@ <% diff.each do |table_file| -%>
@@ -21,17 +21,17 @@ <% table_file.each_line do |spacing, line| -%> <% if spacing -%> | |||||||
---|---|---|---|---|---|---|---|
... | ... | + | |||||
<%= line.nb_line_left %> | +
- <%= line.html_line_left.html_safe %>+ <%= line.html_line_left.html_safe %>
|
- <%= line.nb_line_right %> | +
- <%= line.html_line_right.html_safe %>+ <%= line.html_line_right.html_safe %>
|
@@ -58,10 +58,10 @@ | |||||
---|---|---|---|---|---|
<%= line.nb_line_left %> | -<%= line.nb_line_right %> | ++ |
- <%= line.html_line.html_safe %>+ <%= line.html_line.html_safe %>
|
||
- <%= line_num %> - | +
- <%= line.html_safe %>+ <% if line == "\n" or line == "\r\n" %> + + <% else %> + <%= line.html_safe %>
+ <% end %>
|
||||
<%= line_num %> | +<% if revision && revision != previous_revision %> <%= revision.identifier ? @@ -31,7 +31,11 @@ <%= author.split('<').first %> <% end %> | -<%= line.html_safe %> |
+ <% if line == "\n" or line == "\r\n" %>
+ <%= line.html_safe %> |
+ <% end %>