2012-06-21 07:29:53 +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
|
|
|
|
|
= merge_request.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-01-29 11:04:09 +01:00
|
|
|
= image_tag gravatar_icon(merge_request.author_email), :class => "avatar"
|
2012-07-17 07:17:16 +02:00
|
|
|
|
2012-07-22 14:33:31 +02:00
|
|
|
%p= link_to 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-03-14 23:51:03 +01:00
|
|
|
- if merge_request.upvotes > 0
|
2012-06-21 07:29:53 +02:00
|
|
|
%span.badge.badge-success= "+#{merge_request.upvotes}"
|
