diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2011-08-31 18:50:38 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-08-31 22:51:37 -0300 |
| commit | 3ce3b5b1f1f92d79ee015d246a9f62a725eca5ca (patch) | |
| tree | 9497192646574804508139f6aae27d31cb861e9a /railties/lib | |
| parent | c5a91d02888ae536759780ec6ecb5f7df7241d4b (diff) | |
| download | rails-3ce3b5b1f1f92d79ee015d246a9f62a725eca5ca.tar.gz rails-3ce3b5b1f1f92d79ee015d246a9f62a725eca5ca.tar.bz2 rails-3ce3b5b1f1f92d79ee015d246a9f62a725eca5ca.zip | |
Merge pull request #2780 from guilleiguaran/assets-pipeline-minor-changes
Assets pipeline: fix in manifest location and remove unused code
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index fa7e3b820b..0ca664e4f0 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -43,7 +43,7 @@ module Rails @assets.debug = false @assets.compile = true @assets.digest = false - @assets.manifest = "#{root}/public#{@assets.prefix}" + @assets.manifest = nil @assets.cache_store = [ :file_store, "#{root}/tmp/cache/assets/" ] @assets.js_compressor = nil @assets.css_compressor = nil |