more merge fixups

8c5312e0 · Tim Felgentreff · 5310327c · 8c5312e0 · 8c5312e0
Commit 8c5312e0 authored Oct 26, 2010 by Tim Felgentreff
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

issue.rb app/models/issue.rb +1 -1

journal_observer_test.rb test/unit/journal_observer_test.rb +1 -1

No files found.
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -89,7 +89,7 @@ class Issue < ActiveRecord::Base

  before_create :default_assign
  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 :update_parent_attributes
  

--- a/test/unit/journal_observer_test.rb
+++ b/test/unit/journal_observer_test.rb
@@ -18,7 +18,7 @@
 require File.dirname(__FILE__) + '/../test_helper'

 class JournalObserverTest < ActiveSupport::TestCase
-  fixtures :issues, :issue_statuses, :journals, :journal_details
+  fixtures :issues, :issue_statuses, :journals

  def setup
    ActionMailer::Base.deliveries.clear