show who merged request

2012-03-15 23:32:00 +02:00 · 2012-03-15 23:32:00 +02:00 · 7b75f3cfd3
commit 7b75f3cfd3
parent 828f84fdb3
3 changed files with 16 additions and 1 deletions
--- 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