summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-24 16:27:40 -0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-24 16:27:40 -0700
commit0d50a65b320ac709e82f8b57d543a76638339d07 (patch)
tree71259a153b7be4f0dc5f06026aa994ac7a778441
parent3a602c8432fe6c72f6ed1a7e2314317bfceb33ba (diff)
downloadgitlab-ce-0d50a65b320ac709e82f8b57d543a76638339d07.tar.gz
Fix diff header in discussion blocks
-rw-r--r--app/views/projects/notes/discussions/_diff.html.haml14
1 files changed, 7 insertions, 7 deletions
diff --git a/app/views/projects/notes/discussions/_diff.html.haml b/app/views/projects/notes/discussions/_diff.html.haml
index f717c77a898..711aa39101b 100644
--- a/app/views/projects/notes/discussions/_diff.html.haml
+++ b/app/views/projects/notes/discussions/_diff.html.haml
@@ -2,13 +2,13 @@
- if diff
.diff-file
.diff-header
- - if diff.deleted_file
- %span= diff.old_path
- - else
- %span= diff.new_path
- - if diff.a_mode && diff.b_mode && diff.a_mode != diff.b_mode
- %span.file-mode= "#{diff.a_mode} → #{diff.b_mode}"
- %br/
+ %span
+ - if diff.deleted_file
+ = diff.old_path
+ - else
+ = diff.new_path
+ - if diff.a_mode && diff.b_mode && diff.a_mode != diff.b_mode
+ %span.file-mode= "#{diff.a_mode} → #{diff.b_mode}"
.diff-content
%table
- note.truncated_diff_lines.each do |line|