diff options
Diffstat (limited to 'app/views/merge_requests')
-rw-r--r-- | app/views/merge_requests/_merge_request.html.haml | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/app/views/merge_requests/_merge_request.html.haml b/app/views/merge_requests/_merge_request.html.haml index 9f556c06561..54300fae0d5 100644 --- a/app/views/merge_requests/_merge_request.html.haml +++ b/app/views/merge_requests/_merge_request.html.haml @@ -1,17 +1,19 @@ %li.wll + .right + .left + - if merge_request.notes.any? + %span.btn.small.disabled.padded= pluralize merge_request.notes.count, 'note' + %span.btn.small.disabled.padded + = merge_request.source_branch + → + = merge_request.target_branch = image_tag gravatar_icon(merge_request.author_email), :class => "avatar" %span.update-author %strong= merge_request.author_name authored = time_ago_in_words(merge_request.created_at) ago - - if merge_request.notes.any? - %span.pretty_label= pluralize merge_request.notes.count, 'note' - if merge_request.upvotes > 0 %span.label.success= "+#{merge_request.upvotes}" - .right - %span.label= merge_request.source_branch - → - %span.label= merge_request.target_branch = link_to project_merge_request_path(merge_request.project, merge_request) do - %p.row_title= truncate(merge_request.title, :length => 100) + %p.row_title= truncate(merge_request.title, :length => 80) |