summaryrefslogtreecommitdiff
path: root/app/models/event.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-03-15 00:57:43 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-03-15 00:57:43 +0200
commit5a3f23f395eef87bf3457e6474bac82333e71ec8 (patch)
tree248f5314979c9f86149b3a268cda4f182b402141 /app/models/event.rb
parent27e36998143adca9427750fc90caec1271a4e3d0 (diff)
downloadgitlab-ce-5a3f23f395eef87bf3457e6474bac82333e71ec8.tar.gz
Persist Merge Request diff. Auto merge request close on push
Diffstat (limited to 'app/models/event.rb')
-rw-r--r--app/models/event.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/event.rb b/app/models/event.rb
index 8ab127c02a0..c8af9363133 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -7,6 +7,7 @@ class Event < ActiveRecord::Base
Reopened = 4
Pushed = 5
Commented = 6
+ Merged = 7
belongs_to :project
belongs_to :target, :polymorphic => true