aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2007-02-18 00:00:14 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2007-02-18 00:00:14 +0000
commit392c7f7314d196c54912a65981d79002d032f896 (patch)
tree0aa24aaa84ed9922cb195f5a73183ea823bf56d3
parent2e55095f6fc1ec2799bbdfd1143d487d2de1d7a3 (diff)
downloadrails-392c7f7314d196c54912a65981d79002d032f896.tar.gz
rails-392c7f7314d196c54912a65981d79002d032f896.tar.bz2
rails-392c7f7314d196c54912a65981d79002d032f896.zip
Added default mime type for CSS (Mime::CSS) [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6159 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--actionpack/CHANGELOG2
-rw-r--r--actionpack/lib/action_controller/mime_types.rb1
2 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index e2937eb6d0..07fc186fb1 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Added default mime type for CSS (Mime::CSS) [DHH]
+
* Added that rendering will automatically insert the etag header on 200 OK responses. The etag is calculated using MD5 of the response body. If a request comes in that has a matching etag, the response will be changed to a 304 Not Modified and the response body will be set to an empty string. [DHH]
* Added X-Runtime to all responses with the request run time [DHH]
diff --git a/actionpack/lib/action_controller/mime_types.rb b/actionpack/lib/action_controller/mime_types.rb
index 7ddde23073..66a3133c4f 100644
--- a/actionpack/lib/action_controller/mime_types.rb
+++ b/actionpack/lib/action_controller/mime_types.rb
@@ -2,6 +2,7 @@ Mime::Type.register "*/*", :all
Mime::Type.register "text/plain", :text, [], %w(txt)
Mime::Type.register "text/html", :html, %w( application/xhtml+xml ), %w( xhtml )
Mime::Type.register "text/javascript", :js, %w( application/javascript application/x-javascript )
+Mime::Type.register "text/css", :css
Mime::Type.register "text/calendar", :ics
Mime::Type.register "text/csv", :csv
Mime::Type.register "application/xml", :xml, %w( text/xml application/x-xml )