diff options
| author | Jon Moss <maclover7@users.noreply.github.com> | 2016-03-18 19:29:35 -0400 |
|---|---|---|
| committer | Jon Moss <maclover7@users.noreply.github.com> | 2016-03-18 19:29:35 -0400 |
| commit | dda31d59a03adb7e5aa372e72bb66a3886632f2f (patch) | |
| tree | 46dc0e9022b45e5661456a315af9c63652b29d2e /guides/source | |
| parent | a4ef62279d69d901b99fe0e71338b5aaebab01c0 (diff) | |
| parent | bcad7cebd46e8117aabebe4b2ae2e06bb64632dd (diff) | |
| download | rails-dda31d59a03adb7e5aa372e72bb66a3886632f2f.tar.gz rails-dda31d59a03adb7e5aa372e72bb66a3886632f2f.tar.bz2 rails-dda31d59a03adb7e5aa372e72bb66a3886632f2f.zip | |
Merge pull request #24244 from bronson/asset-pipeline-doc
remove Rails 4 text from asset pipeline guide
Diffstat (limited to 'guides/source')
| -rw-r--r-- | guides/source/asset_pipeline.md | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/guides/source/asset_pipeline.md b/guides/source/asset_pipeline.md index c3b9e4c2ed..cc3da47db9 100644 --- a/guides/source/asset_pipeline.md +++ b/guides/source/asset_pipeline.md @@ -25,13 +25,9 @@ It allows assets in your application to be automatically combined with assets from other gems. For example, jquery-rails includes a copy of jquery.js and enables AJAX features in Rails. -The asset pipeline is technically no longer a core feature from Rails 4 onwards -- it has -been extracted out of the framework into the -[sprockets-rails](https://github.com/rails/sprockets-rails) gem. - -The asset pipeline is enabled by default. - -You can disable the asset pipeline while creating a new application by +The asset pipeline is implemented by the +[sprockets-rails](https://github.com/rails/sprockets-rails) gem, +and is enabled by default. You can disable it while creating a new application by passing the `--skip-sprockets` option. ```bash |