diff options
author | wycats <wycats@gmail.com> | 2010-06-02 22:56:41 +0200 |
---|---|---|
committer | wycats <wycats@gmail.com> | 2010-06-02 22:56:41 +0200 |
commit | ffe001f19dbbd9e697f6300650779f5e1391ce1e (patch) | |
tree | 050df0d7f91f012062d0ba6965410da0aff200eb /actionpack/lib/abstract_controller | |
parent | 26c5680bd01bd0e525eccc5d47a2e7126d9383f7 (diff) | |
download | rails-ffe001f19dbbd9e697f6300650779f5e1391ce1e.tar.gz rails-ffe001f19dbbd9e697f6300650779f5e1391ce1e.tar.bz2 rails-ffe001f19dbbd9e697f6300650779f5e1391ce1e.zip |
Changes made while working on upgrading cells to Rails 3
Diffstat (limited to 'actionpack/lib/abstract_controller')
-rw-r--r-- | actionpack/lib/abstract_controller/base.rb | 1 | ||||
-rw-r--r-- | actionpack/lib/abstract_controller/rendering.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/abstract_controller/base.rb b/actionpack/lib/abstract_controller/base.rb index 8500cbd7f2..ff97a7e76a 100644 --- a/actionpack/lib/abstract_controller/base.rb +++ b/actionpack/lib/abstract_controller/base.rb @@ -1,4 +1,5 @@ require 'active_support/configurable' +require 'active_support/core_ext/module/anonymous' module AbstractController class Error < StandardError; end diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb index d2db366140..6e3998aa21 100644 --- a/actionpack/lib/abstract_controller/rendering.rb +++ b/actionpack/lib/abstract_controller/rendering.rb @@ -1,4 +1,5 @@ require "abstract_controller/base" +require "action_view" module AbstractController class DoubleRenderError < Error |