diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-07-18 10:40:22 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-07-18 10:40:22 +0200 |
| commit | ffea9c46000ade225852ee32e90cb8ad0f4f8316 (patch) | |
| tree | c798d483a2ccab175d2341fc6e4828a5b5859d66 /app/views/notify/note_merge_request_email.html.haml | |
| parent | 22c2814b09960255d9ece0c620858500719858cb (diff) | |
| parent | f1083ba1f6e4ff0c01d5e08b2a6c0b1f9b5a9b9a (diff) | |
| download | gitlab-ce-ffea9c46000ade225852ee32e90cb8ad0f4f8316.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into store-variables-and-when-in-builds-tablestore-variables-and-when-in-builds-table
# Conflicts:
# db/schema.rb
Diffstat (limited to 'app/views/notify/note_merge_request_email.html.haml')
| -rw-r--r-- | app/views/notify/note_merge_request_email.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/notify/note_merge_request_email.html.haml b/app/views/notify/note_merge_request_email.html.haml index 35c4b862bb7..ea7e3d199fd 100644 --- a/app/views/notify/note_merge_request_email.html.haml +++ b/app/views/notify/note_merge_request_email.html.haml @@ -1,4 +1,4 @@ -- if @note.diff_note? +- if @note.diff_note? && @note.diff_file %p.details New comment on diff for = link_to @note.diff_file.file_path, @target_url |