2012-08-11 00:07:50 +02:00
|
|
|
%li.wll{ class: mr_css_classes(merge_request) }
|
2012-03-22 21:57:04 +01:00
|
|
|
.right
|
|
|
|
|
.left
|
2012-06-26 18:08:44 +02:00
|
|
|
- if merge_request.merged?
|
2012-07-05 08:35:23 +02:00
|
|
|
%span.btn.small.disabled.grouped
|
2012-06-26 18:08:44 +02:00
|
|
|
%strong
|
|
|
|
|
%i.icon-ok
|
|
|
|
|
= "MERGED"
|
2012-03-22 21:57:04 +01:00
|
|
|
- if merge_request.notes.any?
|
2012-07-05 08:35:23 +02:00
|
|
|
%span.btn.small.disabled.grouped
|
2012-06-26 20:20:05 +02:00
|
|
|
%i.icon-comment
|
2012-10-05 00:25:40 +02:00
|
|
|
= merge_request.mr_and_commit_notes.count
|
2012-07-05 08:35:23 +02:00
|
|
|
%span.btn.small.disabled.grouped
|
2012-03-22 21:57:04 +01:00
|
|
|
= merge_request.source_branch
|
|
|
|
|
→
|
|
|
|
|
= merge_request.target_branch
|
2012-08-11 00:07:50 +02:00
|
|
|
= image_tag gravatar_icon(merge_request.author_email), class: "avatar"
|
2012-07-17 07:17:16 +02:00
|
|
|
|
2012-08-11 00:07:50 +02:00
|
|
|
%p= link_to_gfm truncate(merge_request.title, length: 80), project_merge_request_path(merge_request.project, merge_request), class: "row_title"
|
2012-07-17 07:17:16 +02:00
|
|
|
|
2011-11-28 19:30:35 +01:00
|
|
|
%span.update-author
|
2012-07-17 07:17:16 +02:00
|
|
|
%small.cdark= "##{merge_request.id}"
|
|
|
|
|
authored by #{merge_request.author_name}
|
2011-11-28 19:30:35 +01:00
|
|
|
= time_ago_in_words(merge_request.created_at)
|
|
|
|
|
ago
|
2012-09-10 15:27:14 +02:00
|
|
|
|
2012-09-08 16:44:56 +02:00
|
|
|
- if merge_request.votes_count > 0
|
2012-09-10 15:27:14 +02:00
|
|
|
= render 'votes/votes_inline', votable: merge_request
|
