From e3ecdb4810c94d8f3d4f899923dcfe12ddb2be56 Mon Sep 17 00:00:00 2001 From: Kelvin Mutuma Date: Thu, 12 Feb 2015 05:41:47 +0300 Subject: Show assignees in the merge-requests index --- app/views/projects/merge_requests/_merge_request.html.haml | 4 ++-- 1 file changed, 2 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..2649078307d 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -15,8 +15,8 @@ = 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)} - if merge_request.votes_count > 0 = render 'votes/votes_inline', votable: merge_request - if merge_request.notes.any? -- cgit v1.2.1 From 783ecc9a2fe8fa18c0fc7692ec6a56e8ea06838a Mon Sep 17 00:00:00 2001 From: Kelvin Mutuma Date: Thu, 12 Feb 2015 05:59:38 +0300 Subject: Show Work In progress if a merge request is not assigned --- app/views/projects/merge_requests/_merge_request.html.haml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index 2649078307d..5afc87fb6b1 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -17,6 +17,8 @@ %span.light= "##{merge_request.iid}" - 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? -- cgit v1.2.1