diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-07 09:09:25 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-07 09:09:25 +0300 |
| commit | 3d064c737e8448880e6180aeddc59000a01aa6a8 (patch) | |
| tree | c97dcfe02e48426f96865068ffe8dcdd17bb1a96 /app/views | |
| parent | 7ba5b9babaa5802c39e686c57cbf4a3f4725c4b0 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/issues/_issue.html.haml | 1 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/_merge_request.html.haml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/views/projects/issues/_issue.html.haml b/app/views/projects/issues/_issue.html.haml index a6c6b77c9dd..54002b9ca2e 100644 --- a/app/views/projects/issues/_issue.html.haml +++ b/app/views/projects/issues/_issue.html.haml @@ -24,6 +24,7 @@ · opened #{time_ago_with_tooltip(issue.created_at, placement: 'bottom')} by #{link_to_member(@project, issue.author, avatar: false)} + = gitlab_team_member_badge(issue.author) - if issue.milestone %span.issuable-milestone.d-none.d-sm-inline-block diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index 744dca1c462..1bde1a41975 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -20,6 +20,7 @@ · opened #{time_ago_with_tooltip(merge_request.created_at, placement: 'bottom')} by #{link_to_member(@project, merge_request.author, avatar: false)} + = gitlab_team_member_badge(merge_request.author) - if merge_request.milestone %span.issuable-milestone.d-none.d-sm-inline-block |