diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-10-15 15:35:08 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-10-15 15:35:08 +0300 |
| commit | 381a6283a9d27ccf0a8d43f33ec01b720ec6a1bf (patch) | |
| tree | e67465b323cc5ed9ed5be5af1581e1e87e920855 | |
| parent | 8200992991f8039ad8a08f21fb84c561c14c7200 (diff) | |
| parent | 67a28cea303d7d61663cd92dc3d72a7a9c06999a (diff) | |
| download | gitlab-ce-381a6283a9d27ccf0a8d43f33ec01b720ec6a1bf.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
| -rw-r--r-- | app/views/projects/notes/discussions/_diff.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/notes/discussions/_diff.html.haml b/app/views/projects/notes/discussions/_diff.html.haml index da71220af17..b4d1cce7980 100644 --- a/app/views/projects/notes/discussions/_diff.html.haml +++ b/app/views/projects/notes/discussions/_diff.html.haml @@ -21,7 +21,7 @@ - else %td.old_line= raw(line.type == "new" ? " " : line.old_pos) %td.new_line= raw(line.type == "old" ? " " : line.new_pos) - %td.line_content{class: "noteable_line #{line.type} #{line_code}", "line_code" => line_code}= raw "#{line.text} " + %td.line_content{class: "noteable_line #{line.type} #{line_code}", "line_code" => line_code}= raw diff_line_content(line.text) - if line_code == note.line_code = render "projects/notes/diff_notes_with_reply", notes: discussion_notes |