wall comment does not create an event on dashboard any more

2 files changed, 7 insertions, 5 deletions

diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb
index 7a0ed251aa8..fbd0f01e5d4 100644
--- a/app/helpers/notes_helper.rb
+++ b/app/helpers/notes_helper.rb
@@ -1,8 +1,7 @@
 module NotesHelper
    # Helps to distinguish e.g. commit notes in mr notes list
   def note_for_main_target?(note)
-    note.for_wall? ||
-      (@target_type.camelize == note.noteable_type && !note.for_diff_line?)
+    (@target_type.camelize == note.noteable_type && !note.for_diff_line?)
   end
 
   def note_target_fields
diff --git a/app/observers/activity_observer.rb b/app/observers/activity_observer.rb
index 152e497794b..c040c4c5ca2 100644
--- a/app/observers/activity_observer.rb
+++ b/app/observers/activity_observer.rb
@@ -4,9 +4,12 @@ class ActivityObserver < ActiveRecord::Observer
   def after_create(record)
     event_author_id = record.author_id
 
-    # Skip status notes
-    if record.kind_of?(Note) && record.note.include?("_Status changed to ")
-      return true
+    if record.kind_of?(Note)
+      # Skip system status notes like 'status changed to close'
+      return true if record.note.include?("_Status changed to ")
+
+      # Skip wall notes to prevent spaming of dashboard
+      return true if record.noteable_type.blank?
     end
 
     if event_author_id