aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/middleware
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-12-02 22:36:21 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-12-02 22:36:21 -0200
commit46923cabe156852bac1ae99c4509ff2780eae2a1 (patch)
tree494992d285acdbd44742c5c932be6526580f6941 /actionpack/lib/action_dispatch/middleware
parentd7d11f0dab7f2875d04c17921e12fe62ac6e9566 (diff)
parent45f70dca7bbd822604941d0486e4a120882afcde (diff)
downloadrails-46923cabe156852bac1ae99c4509ff2780eae2a1.tar.gz
rails-46923cabe156852bac1ae99c4509ff2780eae2a1.tar.bz2
rails-46923cabe156852bac1ae99c4509ff2780eae2a1.zip
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware')
-rw-r--r--actionpack/lib/action_dispatch/middleware/exception_wrapper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb b/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb
index 37bf9c8c9f..377f05c982 100644
--- a/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb
+++ b/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb
@@ -1,5 +1,5 @@
require 'action_controller/metal/exceptions'
-require 'active_support/core_ext/class/attribute_accessors'
+require 'active_support/core_ext/module/attribute_accessors'
module ActionDispatch
class ExceptionWrapper