summaryrefslogtreecommitdiff
path: root/app/views/projects/notes
diff options
context:
space:
mode:
authorAnnabel Dunstone <annabel.dunstone@gmail.com>2016-04-13 12:54:21 -0500
committerAnnabel Dunstone <annabel.dunstone@gmail.com>2016-04-14 09:10:40 -0500
commitd176f873e1fdf23ebeeebf6d2d25927941016390 (patch)
tree3cd60e40d99235f6689cae652456a18b4486f03b /app/views/projects/notes
parent7030ffb0e09dbcc0d03d377846a04fe6cf7d20b6 (diff)
downloadgitlab-ce-d176f873e1fdf23ebeeebf6d2d25927941016390.tar.gz
Add content attributes to discussion diffs; change styling of add-note icon to prevent white spaces in paste
Diffstat (limited to 'app/views/projects/notes')
-rw-r--r--app/views/projects/notes/discussions/_diff.html.haml6
1 files changed, 2 insertions, 4 deletions
diff --git a/app/views/projects/notes/discussions/_diff.html.haml b/app/views/projects/notes/discussions/_diff.html.haml
index 820e31ccd61..6abfb3abc3b 100644
--- a/app/views/projects/notes/discussions/_diff.html.haml
+++ b/app/views/projects/notes/discussions/_diff.html.haml
@@ -20,10 +20,8 @@
%td.new_line.diff-line-num= "..."
%td.line_content.match= line.text
- else
- %td.old_line.diff-line-num
- = raw(type == "new" ? "&nbsp;" : line.old_pos)
- %td.new_line.diff-line-num
- = raw(type == "old" ? "&nbsp;" : line.new_pos)
+ %td.old_line.diff-line-num{data: {linenumber: raw(type == "new" ? "&nbsp;" : line.old_pos)}}
+ %td.new_line.diff-line-num{data: {linenumber: raw(type == "old" ? "&nbsp;" : line.new_pos)}}
%td.line_content{class: "noteable_line #{type} #{line_code}", line_code: line_code}= diff_line_content(line.text)
- if line_code == note.line_code