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

[close #221] Favor charset from processor #224

Merged
merged 2 commits into from
Jan 21, 2016

Conversation

schneems
Copy link
Member

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!.

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!`.
@iggant
Copy link
Contributor

iggant commented Jan 18, 2016

looks great,
will you also backport this patch to 3.x branch?

@schneems
Copy link
Member Author

Yes i'll backport to 3.x.

@iggant
Copy link
Contributor

iggant commented Jan 18, 2016

thank you

@rafaelfranca
Copy link
Member

:shipit:

schneems added a commit that referenced this pull request Jan 21, 2016
@schneems schneems merged commit b05c7e0 into master Jan 21, 2016
@schneems
Copy link
Member Author

@iggant i'm pretty in the weeds right now. Can you cherry pick these two commits off of master and give me a PR to the 3.x branch? Once merged into 3.x branch I can cut a minor release.

@iggant
Copy link
Contributor

iggant commented Feb 1, 2016

@schneems
sorry don't have time for that, you've already done this with #228

@arthurnn arthurnn deleted the schneems/fixcharset-processor branch February 8, 2016 20:55
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.

3 participants