1 files changed, 17 insertions, 6 deletions
diff --git a/app/models/event.rb b/app/models/event.rb
index 2b92783ceac..90376e73753 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -15,6 +15,7 @@
 #
 
 class Event < ActiveRecord::Base
+  include NoteEvent
   include PushEvent
 
   attr_accessible :project, :action, :data, :author_id, :project_id,
@@ -58,12 +59,14 @@ class Event < ActiveRecord::Base
     end
   end
 
-  # Next events currently enabled for system
-  #  - push
-  #  - new issue
-  #  - merge request
-  def allowed?
-    push? || issue? || merge_request? || membership_changed?
+  def proper?
+    if push?
+      true
+    elsif membership_changed?
+      true
+    else
+      (issue? || merge_request? || note? || milestone?) && target
+    end
   end
 
   def project_name
@@ -94,6 +97,14 @@ class Event < ActiveRecord::Base
     action == self.class::Reopened
   end
 
+  def milestone?
+    target_type == "Milestone"
+  end
+
+  def note?
+    target_type == "Note"
+  end
+
   def issue?
     target_type == "Issue"
   end