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: 51315e01561e
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 40e1ead25282
Choose a head ref
  • 6 commits
  • 11 files changed
  • 1 contributor

Commits on Feb 7, 2016

  1. Propagate tainting into scrubbed strings. 

    See ruby/ruby@61c19c9
    @headius
    headius committed Feb 7, 2016
    Copy the full SHA
    db82b21 View commit details

  2. Check if Thread has been frozen when setting thread-local vars.

    @headius
    headius committed Feb 7, 2016
    Copy the full SHA
    9cfffaf View commit details

  3. Return nil for backtraces for dead threads.

    @headius
    headius committed Feb 7, 2016
    Copy the full SHA
    2b4a9f7 View commit details

  4. Update to json 1.8.3.

    @headius
    headius committed Feb 7, 2016
    Copy the full SHA
    16a141f View commit details

  5. Exclude and fix some tests for 2.3. 

    * The NameError#local_variables test was pulled out since it seems
  to be an internal function for MRI.
    @headius
    headius committed Feb 7, 2016
    Copy the full SHA
    ef53b1f View commit details

  6. Missed fixes for String#scrub tainting.

    @headius
    headius committed Feb 7, 2016
    Copy the full SHA
    40e1ead View commit details
Loading