diff options
author | Ryan Bigg <radarlistener@gmail.com> | 2011-10-06 13:33:55 +1100 |
---|---|---|
committer | Ryan Bigg <radarlistener@gmail.com> | 2011-10-06 13:33:55 +1100 |
commit | 4f5878a4a98cc1e8766a0204d94dd96f384fdae9 (patch) | |
tree | c7c116db8f0affc299d0d4f73943ab1dba72a92a /railties/guides | |
parent | 02eac2db9407ddebaca26ea6cb26d6d64a7fb24b (diff) | |
parent | 3d595c5eaeec43e5dc9f2930420506108b0ce813 (diff) | |
download | rails-4f5878a4a98cc1e8766a0204d94dd96f384fdae9.tar.gz rails-4f5878a4a98cc1e8766a0204d94dd96f384fdae9.tar.bz2 rails-4f5878a4a98cc1e8766a0204d94dd96f384fdae9.zip |
Merge branch 'master' of github.com:lifo/docrails
* 'master' of github.com:lifo/docrails:
use Rails.root.join for assets guide
Diffstat (limited to 'railties/guides')
-rw-r--r-- | railties/guides/source/asset_pipeline.textile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/guides/source/asset_pipeline.textile b/railties/guides/source/asset_pipeline.textile index 7795b297f3..ccbc737f17 100644 --- a/railties/guides/source/asset_pipeline.textile +++ b/railties/guides/source/asset_pipeline.textile @@ -120,7 +120,7 @@ All subdirectories that exist within these three locations are added to the sear You can add additional (fully qualified) paths to the pipeline in +config/application.rb+. For example: <ruby> -config.assets.paths << "#{Rails.root}/app/assets/flash" +config.assets.paths << Rails.root.join("app", "assets", "flash") </ruby> h4. Coding Links to Assets |