Skip to content
Browse files

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

Remove highly uncommon `config.assets.manifest` option
  • Loading branch information...
2 parents b4018fa + 25d2b17 commit 71b88518f7c84466f90b3d39fba61281bb782748 @spastorino spastorino committed Sep 19, 2012
View
7 Gemfile
@@ -28,7 +28,12 @@ end
# This needs to be with require false to avoid
# it being automatically loaded by sprockets
gem 'uglifier', require: false
-gem 'sprockets-rails', github: 'rails/sprockets-rails'
+
+if ENV['SPROCKETS_RAILS']
+ gem 'sprockets-rails', path: ENV['SPROCKETS_RAILS']
+else
+ gem 'sprockets-rails', github: 'rails/sprockets-rails'
+end
group :doc do
# The current sdoc cannot generate GitHub links due
View
9 guides/source/asset_pipeline.md
@@ -456,12 +456,6 @@ application.css: application-8af74128f904600e41a6e39241464e03.css
The default location for the manifest is the root of the location specified in `config.assets.prefix` ('/assets' by default).
-This can be changed with the `config.assets.manifest` option. A fully specified path is required:
-
-```ruby
-config.assets.manifest = '/path/to/some/other/location'
-```
-
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).
#### Far-future Expires header
@@ -728,9 +722,6 @@ config.assets.compile = false
# Generate digests for assets URLs.
config.assets.digest = true
-# Defaults to nil and saved in location specified by config.assets.prefix
-# config.assets.manifest = YOUR_PATH
-
# Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
# config.assets.precompile += %w( search.js )
```
View
2 guides/source/configuring.md
@@ -161,8 +161,6 @@ Rails 3.1, by default, is set up to use the `sprockets` gem to manage assets wit
* `config.assets.debug` disables the concatenation and compression of assets. Set to `true` by default in `development.rb`.
-* `config.assets.manifest` defines the full path to be used for the asset precompiler's manifest file. Defaults to using `config.assets.prefix`.
-
* `config.assets.cache_store` defines the cache store that Sprockets will use. The default is the Rails file store.
* `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.
View
5 railties/CHANGELOG.md
@@ -1,5 +1,10 @@
## Rails 4.0.0 (unreleased) ##
+* Remove highly uncommon `config.assets.manifest` option for moving the manifest path.
+ This option is now unsupported in sprockets-rails.
+
+ *Guillermo Iguaran & Dmitry Vorotilin*
+
* Add `config.action_controller.permit_all_parameters` to disable
StrongParameters protection, it's false by default.
View
1 railties/lib/rails/application/configuration.rb
@@ -57,7 +57,6 @@ def initialize(*)
@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

0 comments on commit 71b8851

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