diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-03-15 23:32:00 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-03-15 23:32:00 +0200 |
| commit | 7b75f3cfd34820ecdf0eddb7703bdba1e4c23f9f (patch) | |
| tree | 8716f1529519800c4b902e3c90422f494e6c4285 /app/views/merge_requests/show.html.haml | |
| parent | 828f84fdb35a61c3de93226c1a6cd5c6be68c263 (diff) | |
| download | gitlab-ce-7b75f3cfd34820ecdf0eddb7703bdba1e4c23f9f.tar.gz | |
show who merged request
Diffstat (limited to 'app/views/merge_requests/show.html.haml')
| -rw-r--r-- | app/views/merge_requests/show.html.haml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/app/views/merge_requests/show.html.haml b/app/views/merge_requests/show.html.haml index 3db247742e0..44291cf4e46 100644 --- a/app/views/merge_requests/show.html.haml +++ b/app/views/merge_requests/show.html.haml @@ -28,6 +28,16 @@ %hr - if @merge_request.closed .alert-message.error Closed + - if @merge_request.merged + - event = @merge_request.merge_event + %div + %p + %strong #{event.author_name} + merged this request + %span.cgray + = time_ago_in_words(event.created_at) + ago. + %br - else .alert-message.success = link_to "#", :class => "info_link", :title => "How To Merge" do |