aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/sprockets
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2011-06-14 14:39:34 -0500
committerJoshua Peek <josh@joshpeek.com>2011-06-14 14:39:34 -0500
commit56b301fa7a9f4b1ab2b7b5daf9444555b85d3359 (patch)
tree2c47a529a9fa4ad425a6e1711d8f99aeb0f8c668 /actionpack/lib/sprockets
parent411435a71cc05d4352c62c9efc63be5b2bb60153 (diff)
downloadrails-56b301fa7a9f4b1ab2b7b5daf9444555b85d3359.tar.gz
rails-56b301fa7a9f4b1ab2b7b5daf9444555b85d3359.tar.bz2
rails-56b301fa7a9f4b1ab2b7b5daf9444555b85d3359.zip
Fix appending sprockets paths
Diffstat (limited to 'actionpack/lib/sprockets')
-rw-r--r--actionpack/lib/sprockets/railtie.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/actionpack/lib/sprockets/railtie.rb b/actionpack/lib/sprockets/railtie.rb
index 4b497d142d..9fb66a1833 100644
--- a/actionpack/lib/sprockets/railtie.rb
+++ b/actionpack/lib/sprockets/railtie.rb
@@ -54,7 +54,12 @@ module Sprockets
env = Sprockets::Environment.new(app.root.to_s)
env.static_root = File.join(app.root.join("public"), assets.prefix)
- env.paths.concat assets.paths
+
+ if env.respond_to?(:append_path)
+ assets.paths.each { |path| env.append_path(path) }
+ else
+ env.paths.concat assets.paths
+ end
env.logger = Rails.logger