Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport multiple fixes for asset pipeline from master to 3-1-stable #4058

Merged
merged 5 commits into from Dec 20, 2011

Conversation

guilleiguaran
Copy link
Member

No description provided.

guilleiguaran and others added 5 commits December 20, 2011 10:14
Conflicts:

	railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt
	railties/test/generators/app_generator_test.rb
…with `rake assets:precompile`

This case was not tested and documentation was a bit confusing
on that topic, so it was not obvious if current code
works properly or not.
…Closes rails#3333 rails#3348 rails#3361.

Is wrong use ProcessedAsset#to_s since it returns the content of the file.
Conflicts:

	railties/test/generators/app_generator_test.rb
@guilleiguaran guilleiguaran mentioned this pull request Dec 20, 2011
josevalim added a commit that referenced this pull request Dec 20, 2011
Backport multiple fixes for asset pipeline from master to 3-1-stable
@josevalim josevalim merged commit c4b13a7 into rails:3-1-stable Dec 20, 2011
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants