From b4c903c0352a98a955ebbac5d3b31e4cf4449804 2014-05-24 10:17:50 From: Toshi MARUYAMA Date: 2014-05-24 10:17:50 Subject: [PATCH] remove awesome_nested_set patch from config/initializers/10-patches.rb (#6579) git-svn-id: http://svn.redmine.org/redmine/trunk@13147 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/config/initializers/10-patches.rb b/config/initializers/10-patches.rb index 7247d52..8df4cde 100644 --- a/config/initializers/10-patches.rb +++ b/config/initializers/10-patches.rb @@ -227,8 +227,6 @@ if Rails::VERSION::MAJOR < 4 && RUBY_VERSION >= "2.1" end end -require 'awesome_nested_set/version' - module CollectiveIdea module Acts module NestedSet @@ -237,23 +235,6 @@ module CollectiveIdea new_record? || leaf_without_new_record? end alias_method_chain :leaf?, :new_record - # Reload is needed because children may have updated - # their parent (self) during deletion. - if ::AwesomeNestedSet::VERSION > "2.1.6" - module Prunable - def destroy_descendants_with_reload - destroy_descendants_without_reload - reload - end - alias_method_chain :destroy_descendants, :reload - end - else - def destroy_descendants_with_reload - destroy_descendants_without_reload - reload - end - alias_method_chain :destroy_descendants, :reload - end end end end