summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/views/projects/merge_requests/_merge_request.html.haml6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml
index dedb060a231..5afc87fb6b1 100644
--- a/app/views/projects/merge_requests/_merge_request.html.haml
+++ b/app/views/projects/merge_requests/_merge_request.html.haml
@@ -15,8 +15,10 @@
= merge_request.target_branch
.merge-request-info
%span.light= "##{merge_request.iid}"
- - if merge_request.author
- authored by #{link_to_member(merge_request.source_project, merge_request.author)}
+ - if merge_request.assignee
+ assigned to #{link_to_member(merge_request.source_project, merge_request.assignee)}
+ - else
+ Work In Progress
- if merge_request.votes_count > 0
= render 'votes/votes_inline', votable: merge_request
- if merge_request.notes.any?