diff options
| author | Arun Agrawal <arun@fromjaipur.com> | 2011-06-28 16:51:19 +0530 |
|---|---|---|
| committer | Arun Agrawal <arun@fromjaipur.com> | 2011-06-28 16:51:19 +0530 |
| commit | 1b957177e777085082c46e620a9b96b49aebb5fd (patch) | |
| tree | fba2b31e3040833ed5b6d2e6646fe6b2a50bd9a3 /actionpack/lib/action_dispatch/http | |
| parent | 76581d0f1bcb54c5d7505ae05de150a086dfbd37 (diff) | |
| download | rails-1b957177e777085082c46e620a9b96b49aebb5fd.tar.gz rails-1b957177e777085082c46e620a9b96b49aebb5fd.tar.bz2 rails-1b957177e777085082c46e620a9b96b49aebb5fd.zip | |
Fix test to use Mime::Zip
Diffstat (limited to 'actionpack/lib/action_dispatch/http')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/mime_types.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/http/mime_types.rb b/actionpack/lib/action_dispatch/http/mime_types.rb index ae255f96ae..3da4f91051 100644 --- a/actionpack/lib/action_dispatch/http/mime_types.rb +++ b/actionpack/lib/action_dispatch/http/mime_types.rb @@ -21,9 +21,6 @@ Mime::Type.register "application/rss+xml", :rss Mime::Type.register "application/atom+xml", :atom Mime::Type.register "application/x-yaml", :yaml, %w( text/yaml ) -Mime::Type.register "application/pdf", :pdf, [], %w(pdf) -Mime::Type.register "application/zip", :zip, [], %w(zip) - Mime::Type.register "multipart/form-data", :multipart_form Mime::Type.register "application/x-www-form-urlencoded", :url_encoded_form @@ -31,5 +28,8 @@ Mime::Type.register "application/x-www-form-urlencoded", :url_encoded_form # http://www.json.org/JSONRequest.html Mime::Type.register "application/json", :json, %w( text/x-json application/jsonrequest ) +Mime::Type.register "application/pdf", :pdf, [], %w(pdf) +Mime::Type.register "application/zip", :zip, [], %w(zip) + # Create Mime::ALL but do not add it to the SET. Mime::ALL = Mime::Type.new("*/*", :all, []) |