aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-03-28 07:45:39 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2012-03-28 07:45:39 -0700
commit9897b9a689aa7e72165d90e1ca33919434d74f71 (patch)
tree876bb28e07f6a551f8de3fa169243c7ce9bbd7ee /railties
parent0c525f68f221189dfd63916180f6b5a5b66bea5f (diff)
parent77fedae3ce050178eeff21decff1bf2fee7c3410 (diff)
downloadrails-9897b9a689aa7e72165d90e1ca33919434d74f71.tar.gz
rails-9897b9a689aa7e72165d90e1ca33919434d74f71.tar.bz2
rails-9897b9a689aa7e72165d90e1ca33919434d74f71.zip
Merge pull request #5630 from andhapp/fix-config-asset-manifest
Changed the config.assets.manifest to nil
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt2
1 files changed, 1 insertions, 1 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 d0d9083c37..7b2c86db24 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
@@ -21,7 +21,7 @@
# Generate digests for assets URLs.
config.assets.digest = true
- # Defaults to Rails.root.join("public/assets").
+ # Defaults to nil and saved in location specified by config.assets.prefix
# config.assets.manifest = YOUR_PATH
<%- end -%>