diff options
| author | wycats <wycats@gmail.com> | 2010-06-02 22:56:41 +0200 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2010-06-03 23:32:12 +1000 |
| commit | e57dbfe6af368cca9f4c827eb70937086cbf7ed7 (patch) | |
| tree | 8b9d057a91861756260aea7990308975305ab475 /actionpack/lib/abstract_controller | |
| parent | a9753637f4fcb68f65da96c85dfcb74ca1c13184 (diff) | |
| download | rails-e57dbfe6af368cca9f4c827eb70937086cbf7ed7.tar.gz rails-e57dbfe6af368cca9f4c827eb70937086cbf7ed7.tar.bz2 rails-e57dbfe6af368cca9f4c827eb70937086cbf7ed7.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 |