diff options
author | Joshua Peek <josh@joshpeek.com> | 2011-03-28 13:22:13 -0500 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2011-03-28 13:22:13 -0500 |
commit | 954d73df5312f4829c96a76f1929e45597e85680 (patch) | |
tree | a2afcededf1cc017b284ddcd336bfd018a75ca58 /railties/lib/rails/engine.rb | |
parent | 7197eb77d593768a5278c4fcaac157a2a0f704ca (diff) | |
download | rails-954d73df5312f4829c96a76f1929e45597e85680.tar.gz rails-954d73df5312f4829c96a76f1929e45597e85680.tar.bz2 rails-954d73df5312f4829c96a76f1929e45597e85680.zip |
Add use_sprockets flag
Diffstat (limited to 'railties/lib/rails/engine.rb')
-rw-r--r-- | railties/lib/rails/engine.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb index 23177df11f..1c4e5dadc7 100644 --- a/railties/lib/rails/engine.rb +++ b/railties/lib/rails/engine.rb @@ -434,7 +434,7 @@ module Rails def routes @routes ||= ActionDispatch::Routing::RouteSet.new - @routes.add_route(assets, {}, {}, {}, nil, false) + @routes.add_route(assets, {}, {}, {}, nil, false) if config.use_sprockets @routes.append(&Proc.new) if block_given? @routes end @@ -458,6 +458,8 @@ module Rails end def build_asset_environment + return nil if !use_sprockets + require 'sprockets' env = Sprockets::Environment.new(root.to_s) |