diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-07-30 14:45:54 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-07-30 14:45:54 +0200 |
| commit | 36bd6c8494d4d1deb09f749a02aa9981c8d3080f (patch) | |
| tree | 697f887f318c60bc8731173d7bc2ecdfdc7349e4 /app/views/projects/merge_requests | |
| parent | a06827bff934a7b387dc4280a555e0c81cc06604 (diff) | |
| download | gitlab-ce-36bd6c8494d4d1deb09f749a02aa9981c8d3080f.tar.gz | |
Show who last edited a comment if it wasn't the original author
Diffstat (limited to 'app/views/projects/merge_requests')
| -rw-r--r-- | app/views/projects/merge_requests/show/_mr_title.html.haml | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/show/_mr_title.html.haml b/app/views/projects/merge_requests/show/_mr_title.html.haml index 4e8144b4de2..9a1eb36fc88 100644 --- a/app/views/projects/merge_requests/show/_mr_title.html.haml +++ b/app/views/projects/merge_requests/show/_mr_title.html.haml @@ -1,10 +1,16 @@ %h4.page-title .issue-box{ class: issue_box_class(@merge_request) } = @merge_request.state_human_name - = "Merge Request ##{@merge_request.iid}" + Merge Request ##{@merge_request.iid} %small.creator · - created by #{link_to_member(@project, @merge_request.author)} #{time_ago_with_tooltip(@merge_request.created_at)} + created by #{link_to_member(@project, @merge_request.author)} + = time_ago_with_tooltip(@merge_request.created_at) + - if @merge_request.updated_at != @merge_request.created_at + %span + · + = icon('edit', title: 'edited') + = time_ago_with_tooltip(@merge_request.updated_at, placement: 'bottom') .issue-btn-group.pull-right - if can?(current_user, :update_merge_request, @merge_request) |