Merge branch 'show_diff' into 'master'

Show note diff if diff exists

Merge branch 'show_diff' into 'master'
Show note diff if diff exists
bfd44948 · Dmitriy Zaporozhets · 4e002a71 · 17bb7007 · bfd44948
Commit bfd44948 authored Apr 06, 2014 by Dmitriy Zaporozhets
Show whitespace changes
Inline Side-by-side

Showing with 24 additions and 23 deletions

app/views/projects/notes/_discussion_diff.html.haml app/views/projects/notes/_discussion_diff.html.haml +24 -23

No files found.
--- a/app/views/projects/notes/_discussion_diff.html.haml
+++ b/app/views/projects/notes/_discussion_diff.html.haml
 - diff = note.diff
-.diff-file
+- if diff
+  .diff-file
    .diff-header
      - if diff.deleted_file
        %span= diff.old_path