aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/abstract/layouts_test.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2010-01-26 15:38:49 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2010-01-26 15:38:49 -0800
commitaef76d1e7120a16e0cace1ca89c327c70cbaddf3 (patch)
treef08da969bc8289aed4d0d9ed0c95c637d6ae8f74 /actionpack/test/abstract/layouts_test.rb
parent458b6a7fc905a23643fc0d26146e6bf230c9c472 (diff)
parent3c6891593d84b83c70441b4c953080481bdcc4bf (diff)
downloadrails-aef76d1e7120a16e0cace1ca89c327c70cbaddf3.tar.gz
rails-aef76d1e7120a16e0cace1ca89c327c70cbaddf3.tar.bz2
rails-aef76d1e7120a16e0cace1ca89c327c70cbaddf3.zip
Merge remote branch 'fxn/master'
Diffstat (limited to 'actionpack/test/abstract/layouts_test.rb')
-rw-r--r--actionpack/test/abstract/layouts_test.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/actionpack/test/abstract/layouts_test.rb b/actionpack/test/abstract/layouts_test.rb
index 8cbb72dc83..bf02e5a864 100644
--- a/actionpack/test/abstract/layouts_test.rb
+++ b/actionpack/test/abstract/layouts_test.rb
@@ -1,5 +1,4 @@
require 'abstract_unit'
-require 'active_support/core_ext/class/removal'
module AbstractControllerTests
module Layouts