summaryrefslogtreecommitdiff
path: root/app/views/discussions/_diff_with_notes.html.haml
diff options
context:
space:
mode:
authorDavid Planella <dplanella@gitlab.com>2019-05-28 22:33:07 +0200
committerDavid Planella <dplanella@gitlab.com>2019-05-28 22:33:07 +0200
commitbebc7b58b84b4061fec25c7bf1858c1abd274957 (patch)
tree1b3372425af4451960d6bfba249bd1cc6eed15e5 /app/views/discussions/_diff_with_notes.html.haml
parent38e55d6b96e2bee43e7773182679fbcfe6f41ff3 (diff)
parent8b200634c4909f12cd012c3197c4ffbaf50b99d5 (diff)
downloadgitlab-ce-bebc7b58b84b4061fec25c7bf1858c1abd274957.tar.gz
Merged changes from master
Diffstat (limited to 'app/views/discussions/_diff_with_notes.html.haml')
-rw-r--r--app/views/discussions/_diff_with_notes.html.haml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/discussions/_diff_with_notes.html.haml b/app/views/discussions/_diff_with_notes.html.haml
index 44c898e0fac..8a3c841de0b 100644
--- a/app/views/discussions/_diff_with_notes.html.haml
+++ b/app/views/discussions/_diff_with_notes.html.haml
@@ -11,8 +11,8 @@
= render "projects/diffs/file_header", diff_file: diff_file, url: discussion_path(discussion), show_toggle: false
- if diff_file.text?
- .diff-content.code.js-syntax-highlight
- %table
+ .diff-content
+ %table.code.js-syntax-highlight
- if expanded
- discussions = { discussion.original_line_code => [discussion] }
= render partial: "projects/diffs/line",