diff options
author | Vijay Dev <vijaydev.cse@gmail.com> | 2014-08-19 16:28:53 +0000 |
---|---|---|
committer | Vijay Dev <vijaydev.cse@gmail.com> | 2014-08-19 16:28:53 +0000 |
commit | 41231ef6c6c6a6e546b69add28f04aafb9e0e952 (patch) | |
tree | 71ebb32624a29c5262ad076a5dd95ebe48844f88 /actionpack/lib/action_dispatch/middleware/public_exceptions.rb | |
parent | 0cb3bdb66e87981c1094edecfce9182ae8aeb240 (diff) | |
parent | bc70448f6d6b83c1cd0814c9e93f7ed8245637a7 (diff) | |
download | rails-41231ef6c6c6a6e546b69add28f04aafb9e0e952.tar.gz rails-41231ef6c6c6a6e546b69add28f04aafb9e0e952.tar.bz2 rails-41231ef6c6c6a6e546b69add28f04aafb9e0e952.zip |
Merge branch 'master' of github.com:rails/docrails
Conflicts:
actionpack/lib/action_controller/metal/mime_responds.rb
actionview/lib/action_view/vendor/html-scanner/html/sanitizer.rb
activerecord/lib/active_record/type/value.rb
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware/public_exceptions.rb')
-rw-r--r-- | actionpack/lib/action_dispatch/middleware/public_exceptions.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/public_exceptions.rb b/actionpack/lib/action_dispatch/middleware/public_exceptions.rb index 6c8944e067..040cb215b7 100644 --- a/actionpack/lib/action_dispatch/middleware/public_exceptions.rb +++ b/actionpack/lib/action_dispatch/middleware/public_exceptions.rb @@ -1,4 +1,14 @@ module ActionDispatch + # When called, this middleware renders an error page. By default if an HTML + # response is expected it will render static error pages from the `/public` + # directory. For example when this middleware receives a 500 response it will + # render the template found in `/public/500.html`. + # If an internationalized locale is set, this middleware will attempt to render + # the template in `/public/500.<locale>.html`. If an internationalized template + # is not found it will fall back on `/public/500.html`. + # + # When a request with a content type other than HTML is made, this middleware + # will attempt to convert error information into the appropriate response type. class PublicExceptions attr_accessor :public_path |