diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-12 14:46:41 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-12 14:46:41 -0800 |
| commit | f9880c11f754c278cbd00eb34ea65e90160571db (patch) | |
| tree | 0b42d091f0452964bb7d1499972b4292e5d28865 | |
| parent | 1d9e9c1b920c01122924afe86a949bc97678f06e (diff) | |
| parent | 783ecc9a2fe8fa18c0fc7692ec6a56e8ea06838a (diff) | |
| download | gitlab-ce-f9880c11f754c278cbd00eb34ea65e90160571db.tar.gz | |
Merge pull request #8779 from KelvinMutuma/show-assignees-in-merge-requests-index
Show assignees in the merge-requests index
| -rw-r--r-- | app/views/projects/merge_requests/_merge_request.html.haml | 6 |
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? |