Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 819137547853
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bfc5ee462405
Choose a head ref
  • 2 commits
  • 9 files changed
  • 1 contributor

Commits on Aug 25, 2017

  1. Revert "Use jcodings 1.0.25 to better handle encoding to charset look… 

    …up."

This reverts commit 8191375.
    @headius
    headius committed Aug 25, 2017
    Copy the full SHA
    f398844 View commit details

  2. Work around jcodings null charsets by doing a second lookup. 

    This is equivalent to fixes made for #4716 in jcodings 1.0.25, but
other changes in that version made it too risky to upgrade in
JRuby 9.1.x. The code here wraps jcodings with the appropriate
logic rather than updating.
    @headius
    headius committed Aug 25, 2017
    Copy the full SHA
    bfc5ee4 View commit details
Loading