diff options
| -rw-r--r-- | actionpack/lib/abstract_controller.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/abstract_controller/errors.rb (renamed from actionpack/lib/abstract_controller/rendering.rb) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller.rb b/actionpack/lib/abstract_controller.rb index 909b438a41..5c07753075 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/rendering.rb" + autoload :DoubleRenderError, "abstract_controller/errors.rb" autoload :Helpers autoload :Logger autoload :Translation diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/errors.rb index 8997207550..8997207550 100644 --- a/actionpack/lib/abstract_controller/rendering.rb +++ b/actionpack/lib/abstract_controller/errors.rb |