diff options
| author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-04-13 15:33:44 -0500 |
|---|---|---|
| committer | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-04-14 09:10:40 -0500 |
| commit | 82d0221b632fbb2e7711678b11e9ff26214d9d69 (patch) | |
| tree | 9acb1b05cdcc331a9ccb50470567b7f3f8cf67ad /app/views | |
| parent | d176f873e1fdf23ebeeebf6d2d25927941016390 (diff) | |
| download | gitlab-ce-82d0221b632fbb2e7711678b11e9ff26214d9d69.tar.gz | |
Add line type conditional to diff line helper
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/diffs/_line.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/notes/discussions/_diff.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/diffs/_line.html.haml b/app/views/projects/diffs/_line.html.haml index 2dc6f548437..6c5602acd43 100644 --- a/app/views/projects/diffs/_line.html.haml +++ b/app/views/projects/diffs/_line.html.haml @@ -23,4 +23,4 @@ = link_text - else = link_to "", "##{line_code}", id: line_code, data: { linenumber: link_text } - %td.line_content{class: "noteable_line #{type} #{line_code}", data: { line_code: line_code }}= diff_line_content(line.text) + %td.line_content{class: "noteable_line #{type} #{line_code}", data: { line_code: line_code }}= diff_line_content(line.text, type) diff --git a/app/views/projects/notes/discussions/_diff.html.haml b/app/views/projects/notes/discussions/_diff.html.haml index 6abfb3abc3b..9fd9d5bb2aa 100644 --- a/app/views/projects/notes/discussions/_diff.html.haml +++ b/app/views/projects/notes/discussions/_diff.html.haml @@ -22,7 +22,7 @@ - else %td.old_line.diff-line-num{data: {linenumber: raw(type == "new" ? " " : line.old_pos)}} %td.new_line.diff-line-num{data: {linenumber: raw(type == "old" ? " " : line.new_pos)}} - %td.line_content{class: "noteable_line #{type} #{line_code}", line_code: line_code}= diff_line_content(line.text) + %td.line_content{class: "noteable_line #{type} #{line_code}", line_code: line_code}= diff_line_content(line.text, type) - if line_code == note.line_code = render "projects/notes/diff_notes_with_reply", notes: discussion_notes |