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
base: 4c064f6eb41b
Choose a base ref
...
head repository: jruby/jruby
compare: 6ffbfc9934d4
Choose a head ref
  • 5 commits
  • 0 files changed
  • 1 contributor

Commits on Jan 4, 2015

  1. Align our strConvEncOpts with MRI's. 

    When there's an error from encoding, MRI's version of this
function just returns the incoming bytes as its result. Ours used
a path that always raises an error when transcoding fails. The new
version uses a path more in line with MRI that requires an out
buffer and returns a result, so we can handle it appropriately.

Fixes #2419.
    @headius
    headius committed Jan 4, 2015
    Copy the full SHA
    ff54579 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2015

  1. Merge branch 'test-fix-2419' into jruby-1_7

    @headius
    headius committed Jan 9, 2015
    Copy the full SHA
    01f3945 View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2015

  1. Merge pull request #2451 from Who828/sync_thread_group_fix 

    No need to synchronise a newly created local RubyArray
    @headius
    headius committed Jan 12, 2015
    Copy the full SHA
    d99bfd9 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/jruby-1_7' 

    Conflicts:
	core/src/main/java/org/jruby/RubyThreadGroup.java
	core/src/main/java/org/jruby/util/encoding/CharsetTranscoder.java
	core/src/main/java/org/jruby/util/encoding/Transcoder.java
    @headius
    headius committed Jan 12, 2015
    Copy the full SHA
    01a832b View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/master'

    @headius
    headius committed Jan 12, 2015
    Copy the full SHA
    6ffbfc9 View commit details
    Browse the repository at this point in the history