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.

Sign up for GitHub

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

Jump to bottom

Schneems/charset 3.x #228

Merged
merged 2 commits into from
Feb 1, 2016
Merged

Schneems/charset 3.x #228

merged 2 commits into from
Feb 1, 2016

Conversation

schneems
Copy link
Member

No description provided.

@rails-bot
Copy link

warning Warning warning

  • Pull requests are usually filed against the master branch for this repo, but this one is against 3.x. Please double check that you specified the right target!

@iggant iggant mentioned this pull request Feb 1, 2016
Merged
@schneems
[close #221] Favor charset from processor
07f74f9 
If a charset is returned by a pre-processor use it instead of automatically assigning one. This is needed so that non-gzippable assets will not accidentally be assigned a charset and gzipped later.

We're also removing a hash allocation needed for `Hash.merge!`.
@schneems
Test overwriting default charset behavior.
8ae7134
schneems added a commit that referenced this pull request Feb 1, 2016
@schneems
Merge pull request #228 from rails/schneems/charset-3.x
9f9acb3 
Schneems/charset 3.x
@schneems schneems merged commit 9f9acb3 into 3.x Feb 1, 2016
@iggant iggant mentioned this pull request Feb 2, 2016
Closed
@arthurnn arthurnn deleted the schneems/charset-3.x branch February 8, 2016 20:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@schneems @rails-bot