Skip to content

O
OHR Support
Commit 8c5312e0 authored by Tim Felgentreff's avatar Tim Felgentreff
Browse files
Options

more merge fixups

parent 5310327c
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
app/models/issue.rb
View file @ 8c5312e0
...@@ -89,7 +89,7 @@ class Issue < ActiveRecord::Base ...@@ -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
......
test/unit/journal_observer_test.rb
View file @ 8c5312e0
...@@ -18,7 +18,7 @@ ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment