aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-05-14 17:42:20 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2009-05-14 17:42:20 -0700
commit628110d7eeb446fee7f9e043f113c083d24883c1 (patch)
tree8905c6168ff0f41239031389d472fa9192a3a82b /actionpack
parentc286952050e8fe16b0f6d64ba0687b52cc8f2ae1 (diff)
downloadrails-628110d7eeb446fee7f9e043f113c083d24883c1.tar.gz
rails-628110d7eeb446fee7f9e043f113c083d24883c1.tar.bz2
rails-628110d7eeb446fee7f9e043f113c083d24883c1.zip
Active Support dependencies
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_view/helpers/active_record_helper.rb1
-rw-r--r--actionpack/test/abstract_controller/layouts_test.rb1
2 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_view/helpers/active_record_helper.rb b/actionpack/lib/action_view/helpers/active_record_helper.rb
index 7c0dfdab10..b4b9f6e34b 100644
--- a/actionpack/lib/action_view/helpers/active_record_helper.rb
+++ b/actionpack/lib/action_view/helpers/active_record_helper.rb
@@ -1,5 +1,6 @@
require 'cgi'
require 'action_view/helpers/form_helper'
+require 'active_support/core_ext/class/attribute_accessors'
module ActionView
class Base
diff --git a/actionpack/test/abstract_controller/layouts_test.rb b/actionpack/test/abstract_controller/layouts_test.rb
index 6e1c2bf9e8..d3440c3de0 100644
--- a/actionpack/test/abstract_controller/layouts_test.rb
+++ b/actionpack/test/abstract_controller/layouts_test.rb
@@ -1,4 +1,5 @@
require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper")
+require 'active_support/core_ext/class/removal'
module AbstractControllerTests
module Layouts