diff --git a/app/models/issue.rb b/app/models/issue.rb index d1dc82e8..fdc7d3e7 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -824,17 +824,6 @@ class Issue < ActiveRecord::Base end IssueJournal.class_eval do - after_create :notify_of_updates - - def notify_of_updates - return if self.version == 1 - if Setting.notified_events.include?('issue_updated') - Mailer.deliver_issue_edit(self) - elsif Setting.notified_events.include?('issue_note_added') and !self.notes.blank? - Mailer.deliver_issue_edit(self) - end - end - # Shortcut def new_status if details.keys.include? 'status_id' diff --git a/config/environment.rb b/config/environment.rb index e0c939e4..4a337fcf 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -36,7 +36,7 @@ Rails::Initializer.run do |config| # Activate observers that should always be running # config.active_record.observers = :cacher, :garbage_collector - config.active_record.observers = :message_observer, :issue_observer, :news_observer, :document_observer, :wiki_content_observer + config.active_record.observers = :journal_observer, :message_observer, :issue_observer, :news_observer, :document_observer, :wiki_content_observer # Make Active Record use UTC-base instead of local time # config.active_record.default_timezone = :utc diff --git a/vendor/plugins/acts_as_journalized b/vendor/plugins/acts_as_journalized index 502993c2..62d308af 160000 --- a/vendor/plugins/acts_as_journalized +++ b/vendor/plugins/acts_as_journalized @@ -1 +1 @@ -Subproject commit 502993c2b767945a3d931acba4fbb1466db388c4 +Subproject commit 62d308af1ea818c52145bf15a6f0d246c41bd127