aboutsummaryrefslogtreecommitdiffstats
path: root/railties/guides/source
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2011-09-07 22:33:04 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2011-09-07 22:54:49 +0530
commit190a2bf9c482fef8412982ea31a755d7e59f17b6 (patch)
treeaf17eed83b5325799b220268ea414cefc87b2936 /railties/guides/source
parent0fb3aa750f9980d26b1fe386c3f6cc0bd0bc23e5 (diff)
downloadrails-190a2bf9c482fef8412982ea31a755d7e59f17b6.tar.gz
rails-190a2bf9c482fef8412982ea31a755d7e59f17b6.tar.bz2
rails-190a2bf9c482fef8412982ea31a755d7e59f17b6.zip
Revert "Rails.root is a Pathname, no need to use File.join first."
This reverts commit 760fd1eb42038a64591036fc5d687afc98f272aa. Reason: We need a fully qualified path string here, not a Pathname.
Diffstat (limited to 'railties/guides/source')
-rw-r--r--railties/guides/source/asset_pipeline.textile2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/guides/source/asset_pipeline.textile b/railties/guides/source/asset_pipeline.textile
index e5a08bbed5..bad1c08747 100644
--- a/railties/guides/source/asset_pipeline.textile
+++ b/railties/guides/source/asset_pipeline.textile
@@ -112,7 +112,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 +application.rb+. For example:
<erb>
-config.assets.paths << Rails.root.join('app', 'assets', 'flash')
+config.assets.paths << File.join(Rails.root, 'app', 'assets', 'flash')
</erb>
h4. Coding Links to Assets