2016-08-17 13:16:29 +00:00
|
|
|
- email = local_assigns.fetch(:email, false)
|
2016-06-20 17:23:46 +00:00
|
|
|
- plain = local_assigns.fetch(:plain, false)
|
2017-03-08 16:07:26 +00:00
|
|
|
- discussions = local_assigns.fetch(:discussions, nil)
|
2016-01-28 17:10:36 +00:00
|
|
|
- type = line.type
|
2016-08-18 23:27:22 +00:00
|
|
|
- line_code = diff_file.line_code(line)
|
2017-05-30 20:38:06 +00:00
|
|
|
- if discussions && line.discussable?
|
2017-03-31 02:34:14 +00:00
|
|
|
- line_discussions = discussions[line_code]
|
2017-03-08 16:07:26 +00:00
|
|
|
%tr.line_holder{ class: type, id: (line_code unless plain) }
|
2016-01-28 17:10:36 +00:00
|
|
|
- case type
|
|
|
|
- when 'match'
|
2016-07-21 18:44:12 +00:00
|
|
|
= diff_match_line line.old_pos, line.new_pos, text: line.text
|
2017-03-13 20:09:43 +00:00
|
|
|
- when 'old-nonewline', 'new-nonewline'
|
2016-01-28 17:10:36 +00:00
|
|
|
%td.old_line.diff-line-num
|
|
|
|
%td.new_line.diff-line-num
|
|
|
|
%td.line_content.match= line.text
|
|
|
|
- else
|
2017-03-09 08:59:29 +00:00
|
|
|
%td.old_line.diff-line-num{ class: [type, ("js-avatar-container" if !plain)], data: { linenumber: line.old_pos } }
|
2016-06-18 15:19:57 +00:00
|
|
|
- link_text = type == "new" ? " " : line.old_pos
|
2016-06-20 17:23:46 +00:00
|
|
|
- if plain
|
2016-01-28 17:10:36 +00:00
|
|
|
= link_text
|
|
|
|
- else
|
2016-12-26 10:47:16 +00:00
|
|
|
%a{ href: "##{line_code}", data: { linenumber: link_text } }
|
2017-03-31 02:34:14 +00:00
|
|
|
- discussion = line_discussions.try(:first)
|
2017-03-09 08:59:29 +00:00
|
|
|
- if discussion && discussion.resolvable? && !plain
|
2017-03-08 16:07:26 +00:00
|
|
|
%diff-note-avatars{ "discussion-id" => discussion.id }
|
2016-04-14 14:10:36 +00:00
|
|
|
%td.new_line.diff-line-num{ class: type, data: { linenumber: line.new_pos } }
|
2016-06-18 15:19:57 +00:00
|
|
|
- link_text = type == "old" ? " " : line.new_pos
|
2016-06-20 17:23:46 +00:00
|
|
|
- if plain
|
2016-01-28 17:10:36 +00:00
|
|
|
= link_text
|
|
|
|
- else
|
2016-12-26 10:47:16 +00:00
|
|
|
%a{ href: "##{line_code}", data: { linenumber: link_text } }
|
2016-08-17 13:16:29 +00:00
|
|
|
%td.line_content.noteable_line{ class: type, data: (diff_view_line_data(line_code, diff_file.position(line), type) unless plain) }<
|
|
|
|
- if email
|
2016-11-23 16:21:45 +00:00
|
|
|
%pre= line.text
|
2016-08-17 13:16:29 +00:00
|
|
|
- else
|
2016-10-27 01:47:14 +00:00
|
|
|
= diff_line_content(line.text)
|
2016-08-18 23:27:22 +00:00
|
|
|
|
2017-04-30 20:32:09 +00:00
|
|
|
- if line_discussions&.any?
|
2017-03-31 02:34:14 +00:00
|
|
|
- discussion_expanded = local_assigns.fetch(:discussion_expanded, line_discussions.any?(&:expanded?))
|
|
|
|
= render "discussions/diff_discussion", discussions: line_discussions, expanded: discussion_expanded
|