aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2011-03-30 22:17:43 -0500
committerJoshua Peek <josh@joshpeek.com>2011-03-30 22:17:43 -0500
commitd7b521db1297c1b95a441b3928fc31ab3abd5ed5 (patch)
treef1ed74fad13b13599cf17ae17331cfa34a154cfd
parentbcde6cdf27e96a934466ee16b273846a76c4e335 (diff)
downloadrails-d7b521db1297c1b95a441b3928fc31ab3abd5ed5.tar.gz
rails-d7b521db1297c1b95a441b3928fc31ab3abd5ed5.tar.bz2
rails-d7b521db1297c1b95a441b3928fc31ab3abd5ed5.zip
Fix assets prefix joining
-rw-r--r--railties/lib/rails/application.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index ef3cb794c1..66a1f88c61 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -145,7 +145,7 @@ module Rails
return unless config.assets.enabled
require 'sprockets'
env = Sprockets::Environment.new(root.to_s)
- env.static_root = root.join("public").join(config.assets.prefix)
+ env.static_root = File.join(root.join("public"), config.assets.prefix)
env
end