aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRick Olson <technoweenie@gmail.com>2006-11-19 21:01:25 +0000
committerRick Olson <technoweenie@gmail.com>2006-11-19 21:01:25 +0000
commitca2d704c75121fa15fc7bed642139daf15039de3 (patch)
tree1712db381906f6a8fd8db1dc756ce6cbb7a626fc
parentbc6f0d2f30bb9b052d67e79d917bb6b8c6cfb1f8 (diff)
downloadrails-ca2d704c75121fa15fc7bed642139daf15039de3.tar.gz
rails-ca2d704c75121fa15fc7bed642139daf15039de3.tar.bz2
rails-ca2d704c75121fa15fc7bed642139daf15039de3.zip
Add custom mime type file for mongrel. config/mime.yml is added with generated apps from the rails command. [Rick Olson]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5571 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--railties/CHANGELOG2
-rw-r--r--railties/lib/rails_generator/generators/applications/app/app_generator.rb1
2 files changed, 3 insertions, 0 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index b0e6bb04e7..0d1c70f5cc 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Add custom mime type file for mongrel. config/mime.yml is added with generated apps from the rails command. [Rick Olson]
+
* Update to Prototype 1.5.0_rc2 [5550] which makes it work in Opera again [Thomas Fuchs]
* Make sure that exceptions which are thrown outside of the user code try their best to be handeled in ApplicationController#rescue_action [Tobias Luetke]
diff --git a/railties/lib/rails_generator/generators/applications/app/app_generator.rb b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
index 584aa0cda3..3735cdb0ab 100644
--- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb
+++ b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
@@ -41,6 +41,7 @@ class AppGenerator < Rails::Generator::Base
:app_name => @app_name,
:socket => options[:db] == "mysql" ? mysql_socket_location : nil
}
+ m.template "configs/mime.yml", "config/mime.yml"
m.template "configs/routes.rb", "config/routes.rb"
m.template "configs/apache.conf", "public/.htaccess"