aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2015-01-13 07:59:41 -0800
committerDavid Heinemeier Hansson <david@loudthinking.com>2015-01-13 07:59:41 -0800
commitb9b28d8a2f00ae4552a68336d6dac1e994f16a56 (patch)
tree9cb7e41af09c1f1c70efac3515981468ca734fa7 /railties/lib/rails/generators
parent233029e90ccd57eefc024ffa2f1b6ff317300a4e (diff)
downloadrails-b9b28d8a2f00ae4552a68336d6dac1e994f16a56.tar.gz
rails-b9b28d8a2f00ae4552a68336d6dac1e994f16a56.tar.bz2
rails-b9b28d8a2f00ae4552a68336d6dac1e994f16a56.zip
Set all asset options together
Diffstat (limited to 'railties/lib/rails/generators')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt6
1 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
index 99d7bfb3c9..522e56d204 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
@@ -39,6 +39,9 @@ Rails.application.configure do
# `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
<%- end -%>
+ # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+ # config.action_controller.asset_host = 'http://assets.example.com'
+
# Specifies the header that your server uses for sending files.
# config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
# config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
@@ -58,9 +61,6 @@ Rails.application.configure do
# Use a different cache store in production.
# config.cache_store = :mem_cache_store
-
- # Enable serving of images, stylesheets, and JavaScripts from an asset server.
- # config.action_controller.asset_host = 'http://assets.example.com'
<%- unless options.skip_action_mailer? -%>
# Ignore bad email addresses and do not raise email delivery errors.