aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2012-08-02 21:25:54 +0200
committerXavier Noria <fxn@hashref.com>2012-08-02 21:59:23 +0200
commit4aee8dd486828943fb414504500efdbcfb49f884 (patch)
tree6934b7890b07c9095924c3c1666f14bd7fd66c3c /actionpack/lib/action_view
parent5e1b92044c8f2afa9e0b80095a9c9defbeaaf2e2 (diff)
downloadrails-4aee8dd486828943fb414504500efdbcfb49f884.tar.gz
rails-4aee8dd486828943fb414504500efdbcfb49f884.tar.bz2
rails-4aee8dd486828943fb414504500efdbcfb49f884.zip
load active_support/core_ext/module/delegation in active_support/rails
Diffstat (limited to 'actionpack/lib/action_view')
-rw-r--r--actionpack/lib/action_view/base.rb1
-rw-r--r--actionpack/lib/action_view/test_case.rb1
2 files changed, 0 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index f193292c66..749332eca7 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -1,5 +1,4 @@
require 'active_support/core_ext/module/attr_internal'
-require 'active_support/core_ext/module/delegation'
require 'active_support/core_ext/class/attribute_accessors'
require 'active_support/ordered_options'
require 'action_view/log_subscriber'
diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb
index 02b1c4b22f..55f79bf761 100644
--- a/actionpack/lib/action_view/test_case.rb
+++ b/actionpack/lib/action_view/test_case.rb
@@ -1,4 +1,3 @@
-require 'active_support/core_ext/module/delegation'
require 'active_support/core_ext/module/remove_method'
require 'action_controller'
require 'action_controller/test_case'