deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

wall comment does not create an event on dashboard any more

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-03-19 14:50:26 +02:00
parent b1bd3f1252
commit ba4f0abf47
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/helpers/notes_helper.rb
View file

@ -1,8 +1,7 @@
module NotesHelper module NotesHelper
# Helps to distinguish e.g. commit notes in mr notes list # Helps to distinguish e.g. commit notes in mr notes list
def note_for_main_target?(note) 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 end
def note_target_fields def note_target_fields

9
app/observers/activity_observer.rb
View file

@ -4,9 +4,12 @@ class ActivityObserver < ActiveRecord::Observer
def after_create(record) def after_create(record)
event_author_id = record.author_id event_author_id = record.author_id
# Skip status notes if record.kind_of?(Note)
if record.kind_of?(Note) && record.note.include?("_Status changed to ") # Skip system status notes like 'status changed to close'
return true 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 end
if event_author_id if event_author_id