aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-09-19 20:57:29 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2012-09-19 20:57:29 -0700
commit71b88518f7c84466f90b3d39fba61281bb782748 (patch)
treec9441d1b0dcee884405417717a8a3e3f171b3dae /railties/lib/rails
parentb4018fa74024ca4c80070f9922833431c567f0e7 (diff)
parent25d2b17a99a78955a90682fa41fda268c5532129 (diff)
downloadrails-71b88518f7c84466f90b3d39fba61281bb782748.tar.gz
rails-71b88518f7c84466f90b3d39fba61281bb782748.tar.bz2
rails-71b88518f7c84466f90b3d39fba61281bb782748.zip
Merge pull request #7702 from guilleiguaran/remove-manifest-option
Remove highly uncommon `config.assets.manifest` option
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/application/configuration.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 580d7c6c77..613c5b25f0 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -57,7 +57,6 @@ module Rails
@assets.debug = false
@assets.compile = true
@assets.digest = false
- @assets.manifest = nil
@assets.cache_store = [ :file_store, "#{root}/tmp/cache/assets/" ]
@assets.js_compressor = nil
@assets.css_compressor = nil