diff options
| author | Łukasz Strzałkowski <lukasz.strzalkowski@gmail.com> | 2013-07-05 13:30:22 +0200 |
|---|---|---|
| committer | Łukasz Strzałkowski <lukasz.strzalkowski@gmail.com> | 2013-08-25 11:39:08 +0200 |
| commit | c90971644a90372cfa56dac8b9b2ce709a6e7267 (patch) | |
| tree | 0add4bc56b06b30f4adf6097083ad88810d9fc74 /actionpack | |
| parent | cad8a2018752050dcd536c255f3865c2a8bb30c3 (diff) | |
| download | rails-c90971644a90372cfa56dac8b9b2ce709a6e7267.tar.gz rails-c90971644a90372cfa56dac8b9b2ce709a6e7267.tar.bz2 rails-c90971644a90372cfa56dac8b9b2ce709a6e7267.zip | |
Revert "Rename abstract_controller/rendering. to errors.rb"
This reverts commit 6fe91ec5008838338e54ab8570f7c95ee0cdd8e8.
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/abstract_controller.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/abstract_controller/rendering.rb (renamed from actionpack/lib/abstract_controller/errors.rb) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller.rb b/actionpack/lib/abstract_controller.rb index 5c07753075..909b438a41 100644 --- a/actionpack/lib/abstract_controller.rb +++ b/actionpack/lib/abstract_controller.rb @@ -10,7 +10,7 @@ module AbstractController autoload :Base autoload :Callbacks autoload :Collector - autoload :DoubleRenderError, "abstract_controller/errors.rb" + autoload :DoubleRenderError, "abstract_controller/rendering.rb" autoload :Helpers autoload :Logger autoload :Translation diff --git a/actionpack/lib/abstract_controller/errors.rb b/actionpack/lib/abstract_controller/rendering.rb index 8997207550..8997207550 100644 --- a/actionpack/lib/abstract_controller/errors.rb +++ b/actionpack/lib/abstract_controller/rendering.rb |