summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests/_merge_request.html.haml
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/projects/merge_requests/_merge_request.html.haml')
-rw-r--r--app/views/projects/merge_requests/_merge_request.html.haml22
1 files changed, 7 insertions, 15 deletions
diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml
index b230b3a0110..391193eed6c 100644
--- a/app/views/projects/merge_requests/_merge_request.html.haml
+++ b/app/views/projects/merge_requests/_merge_request.html.haml
@@ -1,8 +1,8 @@
%li{ class: mr_css_classes(merge_request) }
- .merge-request-title
+ .merge-request-title.title
%span.merge-request-title-text
- = link_to_gfm merge_request.title, merge_request_path(merge_request), class: "row_title"
- %ul.controls.light
+ = link_to_gfm merge_request.title, merge_request_path(merge_request)
+ %ul.controls
- if merge_request.merged?
%li
MERGED
@@ -17,7 +17,7 @@
- if merge_request.open? && merge_request.broken?
%li
- = link_to merge_request_path(merge_request), class: "has_tooltip", title: "Cannot be merged automatically", data: { container: 'body' } do
+ = link_to merge_request_path(merge_request), class: "has-tooltip", title: "Cannot be merged automatically", data: { container: 'body' } do
= icon('exclamation-triangle')
- if merge_request.assignee
@@ -25,23 +25,15 @@
= link_to_member(merge_request.source_project, merge_request.assignee, name: false, title: "Assigned to :name")
- upvotes, downvotes = merge_request.upvotes, merge_request.downvotes
- - if upvotes > 0 || downvotes > 0
+ - if upvotes > 0
%li
= icon('thumbs-up')
= upvotes
- - else
- %li{ class: 'merge-request-no-votes' }
- = icon('thumbs-up')
- = upvotes
- - if upvotes > 0 || downvotes > 0
+ - if downvotes > 0
%li
= icon('thumbs-down')
= downvotes
- - else
- %li{ class: 'merge-request-no-votes' }
- = icon('thumbs-down')
- = downvotes
- note_count = merge_request.mr_and_commit_notes.user.count
- if note_count > 0
@@ -56,7 +48,7 @@
= note_count
.merge-request-info
- \##{merge_request.iid} ·
+ #{merge_request.to_reference} ·
opened #{time_ago_with_tooltip(merge_request.created_at, placement: 'bottom')}
by #{link_to_member(@project, merge_request.author, avatar: false)}
- if merge_request.target_project.default_branch != merge_request.target_branch