Changeset [eceda33263d90a1b2a61d0e039817d06a23a0482] by Joshua Peek

May 18th, 2011 @ 08:27 PM

Merge branch 'master' into sass-importer

Conflicts:

lib/sprockets.rb

https://github.com/sstephenson/sprockets/commit/eceda33263d90a1b2a6...

Committed by Joshua Peek

  • A lib/sprockets/bundled_asset.rb
  • A lib/sprockets/charset_normalizer.rb
  • A lib/sprockets/coffee_script_template.rb
  • A lib/sprockets/ejs_template.rb
  • A lib/sprockets/jst_processor.rb
  • A test/fixtures/asset/bar-utf8.css
  • A test/fixtures/asset/charset.css
  • A test/fixtures/asset/circle/a.js
  • A test/fixtures/asset/circle/b.js
  • A test/fixtures/asset/circle/c.js
  • A test/fixtures/asset/foo-utf8.css
  • A test/fixtures/asset/require_self_twice.css
  • A test/fixtures/default/coffee/foo.coffee
  • A test/fixtures/default/coffee/index.js
  • A test/fixtures/default/hello.jst.ejs
  • A test/fixtures/public/compiled-application.js
  • A test/test_asset.rb
  • R lib/sprockets/concatenated_asset.rb
  • R lib/sprockets/concatenation.rb
  • R test/fixtures/jst/hello.js.jst
  • R test/fixtures/jst/people/list.jst
  • R test/test_concatenated_asset.rb
  • M lib/sprockets.rb
  • M lib/sprockets/context.rb
  • M lib/sprockets/directive_processor.rb
  • M lib/sprockets/environment.rb
  • M lib/sprockets/environment_index.rb
  • M lib/sprockets/errors.rb
  • M lib/sprockets/processing.rb
  • M lib/sprockets/server.rb
  • M lib/sprockets/static_asset.rb
  • M lib/sprockets/static_compilation.rb
  • M sprockets.gemspec
  • M test/test_context.rb
  • M test/test_directive_processor.rb
  • M test/test_environment.rb
  • M test/test_server.rb
New-ticket Create new ticket

Create your profile

Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป

JavaScript dependency management and concatenation
<a href="http://getsprockets.org/">http://getsprockets.org/</a>