aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-03-28 20:11:27 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2012-03-28 20:11:27 -0700
commit2b2a76087c4caab34e6018bc562eb0ef6f8b704c (patch)
tree35f63803d85556e19afcd037bfc83c4b084ef840 /railties/lib/rails
parent5747e53c92c3fbb52814c3313c489f2a208f685f (diff)
parenta157d5934919b5494cc053556af0b79fde8ea416 (diff)
downloadrails-2b2a76087c4caab34e6018bc562eb0ef6f8b704c.tar.gz
rails-2b2a76087c4caab34e6018bc562eb0ef6f8b704c.tar.bz2
rails-2b2a76087c4caab34e6018bc562eb0ef6f8b704c.zip
Merge pull request #5644 from andhapp/fix-config-asset-manifest-3-2
Changed the config.assets.manifest to nil
Diffstat (limited to 'railties/lib/rails')
-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 0f571f7c1a..b7a5af178d 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 -%>