Skip to content
This repository
Browse code

Merge pull request #7702 from guilleiguaran/remove-manifest-option

Remove highly uncommon `config.assets.manifest` option
  • Loading branch information...
commit 71b88518f7c84466f90b3d39fba61281bb782748 2 parents b4018fa + 25d2b17
Santiago Pastorino spastorino authored
7 Gemfile
@@ -28,7 +28,12 @@ end
28 28 # This needs to be with require false to avoid
29 29 # it being automatically loaded by sprockets
30 30 gem 'uglifier', require: false
31   -gem 'sprockets-rails', github: 'rails/sprockets-rails'
  31 +
  32 +if ENV['SPROCKETS_RAILS']
  33 + gem 'sprockets-rails', path: ENV['SPROCKETS_RAILS']
  34 +else
  35 + gem 'sprockets-rails', github: 'rails/sprockets-rails'
  36 +end
32 37
33 38 group :doc do
34 39 # The current sdoc cannot generate GitHub links due
9 guides/source/asset_pipeline.md
Source Rendered
@@ -456,12 +456,6 @@ application.css: application-8af74128f904600e41a6e39241464e03.css
456 456
457 457 The default location for the manifest is the root of the location specified in `config.assets.prefix` ('/assets' by default).
458 458
459   -This can be changed with the `config.assets.manifest` option. A fully specified path is required:
460   -
461   -```ruby
462   -config.assets.manifest = '/path/to/some/other/location'
463   -```
464   -
465 459 NOTE: If there are missing precompiled files in production you will get an `Sprockets::Helpers::RailsHelper::AssetPaths::AssetNotPrecompiledError` exception indicating the name of the missing file(s).
466 460
467 461 #### Far-future Expires header
@@ -728,9 +722,6 @@ config.assets.compile = false
728 722 # Generate digests for assets URLs.
729 723 config.assets.digest = true
730 724
731   -# Defaults to nil and saved in location specified by config.assets.prefix
732   -# config.assets.manifest = YOUR_PATH
733   -
734 725 # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
735 726 # config.assets.precompile += %w( search.js )
736 727 ```
2  guides/source/configuring.md
Source Rendered
@@ -161,8 +161,6 @@ Rails 3.1, by default, is set up to use the `sprockets` gem to manage assets wit
161 161
162 162 * `config.assets.debug` disables the concatenation and compression of assets. Set to `true` by default in `development.rb`.
163 163
164   -* `config.assets.manifest` defines the full path to be used for the asset precompiler's manifest file. Defaults to using `config.assets.prefix`.
165   -
166 164 * `config.assets.cache_store` defines the cache store that Sprockets will use. The default is the Rails file store.
167 165
168 166 * `config.assets.version` is an option string that is used in MD5 hash generation. This can be changed to force all files to be recompiled.
5 railties/CHANGELOG.md
Source Rendered
... ... @@ -1,5 +1,10 @@
1 1 ## Rails 4.0.0 (unreleased) ##
2 2
  3 +* Remove highly uncommon `config.assets.manifest` option for moving the manifest path.
  4 + This option is now unsupported in sprockets-rails.
  5 +
  6 + *Guillermo Iguaran & Dmitry Vorotilin*
  7 +
3 8 * Add `config.action_controller.permit_all_parameters` to disable
4 9 StrongParameters protection, it's false by default.
5 10
1  railties/lib/rails/application/configuration.rb
@@ -57,7 +57,6 @@ def initialize(*)
57 57 @assets.debug = false
58 58 @assets.compile = true
59 59 @assets.digest = false
60   - @assets.manifest = nil
61 60 @assets.cache_store = [ :file_store, "#{root}/tmp/cache/assets/" ]
62 61 @assets.js_compressor = nil
63 62 @assets.css_compressor = nil

0 comments on commit 71b8851

Please sign in to comment.
Something went wrong with that request. Please try again.