This project is archived and is in readonly mode.
Changeset [f004c8868196f62a6810bc7e693b407fd27a5fa7] by Joshua Peek
Revision f004c8868196f62a6810bc7e693b407fd27a5fa7,
committed by Joshua Peek
· April 13th, 2011 @ 04:35 AM
Merge branch 'sprockets'
https://github.com/rails/rails/commit/f004c8868196f62a6810bc7e693b4...
19 changed files
-
A
actionpack/lib/action_view/helpers/sprockets_helper.rb -
A
actionpack/test/fixtures/sprockets/app/javascripts/application.js -
A
actionpack/test/fixtures/sprockets/app/javascripts/dir/xmlhr.js -
A
actionpack/test/fixtures/sprockets/app/javascripts/xmlhr.js -
A
actionpack/test/fixtures/sprockets/app/stylesheets/application.css -
A
actionpack/test/fixtures/sprockets/app/stylesheets/dir/style.css -
A
actionpack/test/fixtures/sprockets/app/stylesheets/style.css -
A
actionpack/test/template/sprockets_helper_test.rb -
A
railties/lib/rails/tasks/assets.rake -
M
Gemfile -
M
actionpack/lib/abstract_controller/asset_paths.rb -
M
actionpack/lib/action_controller/railtie.rb -
M
actionpack/lib/action_view/helpers.rb -
M
actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb -
M
actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb -
M
railties/lib/rails/application.rb -
M
railties/lib/rails/application/configuration.rb -
M
railties/lib/rails/application/finisher.rb -
M
railties/lib/rails/tasks.rb