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/models/project.rb
+++ b/app/models/project.rb
@ -99,7 +99,8 @@ class Project < ActiveRecord::Base
        Event.create(
          :project => self,
          :action => Event::Merged,
-          :data => {:merge_request_id => merge_request.id},
+          :target_id => merge_request.id,
+          :target_type => "MergeRequest",
          :author_id => user.id
        )
      end