diff --git a/app/models/watcher.rb b/app/models/watcher.rb index 00de677b8..633cd3565 100644 --- a/app/models/watcher.rb +++ b/app/models/watcher.rb @@ -60,9 +60,11 @@ class Watcher < ActiveRecord::Base def self.prune_single_user(user, options={}) return unless user.is_a?(User) + pruned = 0 where(:user_id => user.id).each do |watcher| next if watcher.watchable.nil? + if options.has_key?(:project) unless watcher.watchable.respond_to?(:project) && watcher.watchable.project == options[:project]