Permalink
Browse files

Merge pull request #4527 from rafaelfranca/av-logger

Remove delegation to ActionController::Base
  • Loading branch information...
2 parents 660cc40 + e89a7f5 commit 423b2626d85f75bb5fec03909ff8963bded7c7d5 @josevalim josevalim committed Jan 18, 2012
Showing with 0 additions and 11 deletions.
  1. +0 −1 actionpack/lib/action_view/base.rb
  2. +0 −10 activesupport/lib/active_support/testing/isolation.rb
@@ -147,7 +147,6 @@ class Base
class << self
delegate :erb_trim_mode=, :to => 'ActionView::Template::Handlers::ERB'
- delegate :logger, :to => 'ActionController::Base', :allow_nil => true
def cache_template_loading
ActionView::Resolver.caching?
@@ -117,13 +117,3 @@ def run_in_isolation(&blk)
end
end
end
-
-# Only in subprocess for windows / jruby.
-if ENV['ISOLATION_TEST']
- require "test/unit/collector/objectspace"
- class Test::Unit::Collector::ObjectSpace
- def include?(test)
- super && test.method_name == ENV['ISOLATION_TEST']
- end
- end
-end

0 comments on commit 423b262

Please sign in to comment.