aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2011-08-30 16:30:53 -0500
committerGuillermo Iguaran <guilleiguaran@gmail.com>2011-08-31 13:12:25 -0500
commitd0b3937b8fe2cbc4385e843d47249af3e7181a83 (patch)
treeed3223e40c61d9003008d56a12de414153b425a0 /railties/lib
parentf236e00189b5a6cf0cebac5c275f64d41d73428d (diff)
downloadrails-d0b3937b8fe2cbc4385e843d47249af3e7181a83.tar.gz
rails-d0b3937b8fe2cbc4385e843d47249af3e7181a83.tar.bz2
rails-d0b3937b8fe2cbc4385e843d47249af3e7181a83.zip
Set default location of manifest with config.assets.manifest
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/application/configuration.rb1
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt3
2 files changed, 4 insertions, 0 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 85e0cd5061..fa7e3b820b 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -43,6 +43,7 @@ module Rails
@assets.debug = false
@assets.compile = true
@assets.digest = false
+ @assets.manifest = "#{root}/public#{@assets.prefix}"
@assets.cache_store = [ :file_store, "#{root}/tmp/cache/assets/" ]
@assets.js_compressor = nil
@assets.css_compressor = nil
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 b4754cfc6d..64e2c09467 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
@@ -20,6 +20,9 @@
# Generate digests for assets URLs
config.assets.digest = true
+ # Defaults to Rails.root.join("public/assets")
+ # config.assets.manifest = YOUR_PATH
+
# 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