diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2016-07-08 00:41:38 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2016-07-08 00:41:38 +0100 |
| commit | 1f73afd0452b7f324b5c1f6e3ffeec7110c77f31 (patch) | |
| tree | 434d752f21b662981093f3e6e4dac492c476f04e /app/views/projects/diffs/_parallel_view.html.haml | |
| parent | 71e4175f654a5e6b1e20f03966af49bf9af65f37 (diff) | |
| download | gitlab-ce-1f73afd0452b7f324b5c1f6e3ffeec7110c77f31.tar.gz | |
Registered FilesCommentButton as a jQuery plugin and made review changes
Diffstat (limited to 'app/views/projects/diffs/_parallel_view.html.haml')
| -rw-r--r-- | app/views/projects/diffs/_parallel_view.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/diffs/_parallel_view.html.haml b/app/views/projects/diffs/_parallel_view.html.haml index 0f75fb53eb7..d208fcee10b 100644 --- a/app/views/projects/diffs/_parallel_view.html.haml +++ b/app/views/projects/diffs/_parallel_view.html.haml @@ -15,7 +15,7 @@ - else %td.old_line.diff-line-num{id: left[:line_code], class: [left[:type], ('empty-cell' unless left[:number])], data: { linenumber: left[:number] }} %a{href: "##{left[:line_code]}" }= raw(left[:number]) - %td.line_content.parallel.noteable_line{class: [left[:type], ('empty-cell' if left[:text].empty?)], data: diff_view_line_data(left[:line_code], left[:position], left[:type])}= diff_line_content(left[:text]) + %td.line_content.parallel.noteable_line{class: [left[:type], ('empty-cell' if left[:text].empty?)], data: diff_view_line_data(left[:line_code], left[:position], 'old')}= diff_line_content(left[:text]) - if right[:type] == 'new' - new_line_type = 'new' @@ -28,7 +28,7 @@ %td.new_line.diff-line-num{id: new_line_code, class: [new_line_type, ('empty-cell' unless right[:number])], data: { linenumber: right[:number] }} %a{href: "##{new_line_code}" }= raw(right[:number]) - %td.line_content.parallel.noteable_line{class: [new_line_type, ('empty-cell' if right[:text].empty?)], data: diff_view_line_data(new_line_code, new_position, new_line_type)}= diff_line_content(right[:text]) + %td.line_content.parallel.noteable_line{class: [new_line_type, ('empty-cell' if right[:text].empty?)], data: diff_view_line_data(new_line_code, new_position, 'new')}= diff_line_content(right[:text]) - unless @diff_notes_disabled - notes_left, notes_right = organize_comments(left, right) |