more merge fixups
This commit is contained in:
parent
5310327c8a
commit
8c5312e0ec
|
@ -89,7 +89,7 @@ class Issue < ActiveRecord::Base
|
||||||
|
|
||||||
before_create :default_assign
|
before_create :default_assign
|
||||||
before_save :close_duplicates, :update_done_ratio_from_issue_status
|
before_save :close_duplicates, :update_done_ratio_from_issue_status
|
||||||
after_save :reschedule_following_issues, :update_nested_set_attributes, :update_parent_attributes, :create_journal
|
after_save :reschedule_following_issues, :update_nested_set_attributes, :update_parent_attributes
|
||||||
after_destroy :destroy_children
|
after_destroy :destroy_children
|
||||||
after_destroy :update_parent_attributes
|
after_destroy :update_parent_attributes
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
require File.dirname(__FILE__) + '/../test_helper'
|
require File.dirname(__FILE__) + '/../test_helper'
|
||||||
|
|
||||||
class JournalObserverTest < ActiveSupport::TestCase
|
class JournalObserverTest < ActiveSupport::TestCase
|
||||||
fixtures :issues, :issue_statuses, :journals, :journal_details
|
fixtures :issues, :issue_statuses, :journals
|
||||||
|
|
||||||
def setup
|
def setup
|
||||||
ActionMailer::Base.deliveries.clear
|
ActionMailer::Base.deliveries.clear
|
||||||
|
|
Loading…
Reference in New Issue