diff options
| author | Godfrey Chan <godfreykfc@gmail.com> | 2014-12-19 14:16:29 -0800 |
|---|---|---|
| committer | Godfrey Chan <godfreykfc@gmail.com> | 2014-12-19 14:55:34 -0800 |
| commit | 2d04bdd86fb4a9c69e1ca1ffe92188a9ca4f88c8 (patch) | |
| tree | 842f600e072f0ed0b13062a82f36cb7be6129433 /guides/source/asset_pipeline.md | |
| parent | 352680c1d394a2177437f20673ede0753d651913 (diff) | |
| download | rails-2d04bdd86fb4a9c69e1ca1ffe92188a9ca4f88c8.tar.gz rails-2d04bdd86fb4a9c69e1ca1ffe92188a9ca4f88c8.tar.bz2 rails-2d04bdd86fb4a9c69e1ca1ffe92188a9ca4f88c8.zip | |
Merge pull request #18100 from chancancode/serve_static_files
Allow static asset serving from env variable (enhanced!)
Conflicts:
railties/CHANGELOG.md
Diffstat (limited to 'guides/source/asset_pipeline.md')
| -rw-r--r-- | guides/source/asset_pipeline.md | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/guides/source/asset_pipeline.md b/guides/source/asset_pipeline.md index 8764546873..156daf1bac 100644 --- a/guides/source/asset_pipeline.md +++ b/guides/source/asset_pipeline.md @@ -167,9 +167,8 @@ directory. Files in this directory are served by the Sprockets middleware. Assets can still be placed in the `public` hierarchy. Any assets under `public` will be served as static files by the application or web server when -`config.serve_static_assets` is set to true. You should use -`app/assets` for files that must undergo some pre-processing before they are -served. +`config.serve_static_files` is set to true. You should use `app/assets` for +files that must undergo some pre-processing before they are served. In production, Rails precompiles these files to `public/assets` by default. The precompiled copies are then served as static assets by the web server. The files |