diff options
Diffstat (limited to 'app/views/projects/merge_requests/show/_state_widget.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/show/_state_widget.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/show/_state_widget.html.haml b/app/views/projects/merge_requests/show/_state_widget.html.haml index 44bd9347f51..e4c71bfc1be 100644 --- a/app/views/projects/merge_requests/show/_state_widget.html.haml +++ b/app/views/projects/merge_requests/show/_state_widget.html.haml @@ -11,7 +11,7 @@ - if @merge_request.closed? %h4 - Closed + Rejected - if @merge_request.closed_event by #{link_to_member(@project, @merge_request.closed_event.author, avatar: false)} #{time_ago_with_tooltip(@merge_request.closed_event.created_at)} @@ -19,7 +19,7 @@ - if @merge_request.merged? %h4 - Merged + Accepted - if @merge_request.merge_event by #{link_to_member(@project, @merge_request.merge_event.author, avatar: false)} #{time_ago_with_tooltip(@merge_request.merge_event.created_at)} |