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: 320f656d25bb
Choose a base ref
...
head repository: jruby/jruby
compare: c28f4cec7751
Choose a head ref
  • 16 commits
  • 45 files changed
  • 5 contributors

Commits on Apr 26, 2015

  1. [Truffle] Add MRI tests to Travis builds and update the jt tool.

    @bjfish
    bjfish committed Apr 26, 2015
    Configuration menu
    Copy the full SHA
    3e6a636 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2015

  1. Merge pull request #2870 from bjfish/truffle_mri_travis 

    [Truffle] Add MRI tests to Travis builds and update the jt tool.
    @chrisseaton
    chrisseaton committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    d434ae5 View commit details
    Browse the repository at this point in the history

  2. [Truffle] Reorder priorities when searching for Graal.

    @chrisseaton
    chrisseaton committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    a5d291d View commit details
    Browse the repository at this point in the history

  3. [Truffle] Restore jt test fast, as it will take me ages to unlearn th… 

    …at one.
    @chrisseaton
    chrisseaton committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    96f075a View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2015

  1. [Truffle] Fix load of default arguments that are arrays.

    @chrisseaton
    chrisseaton committed Apr 29, 2015
    Configuration menu
    Copy the full SHA
    146856d View commit details
    Browse the repository at this point in the history

  2. [Truffle] Add ruby/test_syntax.rb to mri test index with excludes.

    @bjfish
    bjfish committed Apr 29, 2015
    2 Configuration menu
    Copy the full SHA
    5a83ff7 View commit details
    Browse the repository at this point in the history

  3. [Truffle] Add cgi tests to mri test index with excludes.

    @bjfish
    bjfish committed Apr 29, 2015
    Configuration menu
    Copy the full SHA
    cedad15 View commit details
    Browse the repository at this point in the history

  4. [Truffle] Implemented Bignum#==(BasicObject).

    @nirvdrum
    nirvdrum committed Apr 29, 2015
    Configuration menu
    Copy the full SHA
    a7f4542 View commit details
    Browse the repository at this point in the history

  5. Improve NameError names to align with MRI. Fixes #2869. 

    This is not exactly the same as MRI but it's not too bad for a few
additional one-off fixes.

There are few (or maybe no) specs in RubySpec and only a handful
in MRI testing what NameError should be in various cases; TBD.
    @headius
    headius committed Apr 29, 2015
    Configuration menu
    Copy the full SHA
    e937702 View commit details
    Browse the repository at this point in the history

  6. putting the jruby-classloader as context classloader means that all a… 

    …ttached "jars" can be found via

the Thread.currentThread.contextClassLoader. running jruby from other environments like servlets just
leave the context classloader as is. so this was a commandline only feature.

finally it keeps the classloader semantic uniform wether executed from commandline or inside a j2ee container
or osgi framework or embedded jruby in a java application
    @mkristian
    mkristian committed Apr 29, 2015
    3 Configuration menu
    Copy the full SHA
    ff10216 View commit details
    Browse the repository at this point in the history

  7. back to SNAPSHOT version

    @mkristian
    mkristian committed Apr 29, 2015
    Configuration menu
    Copy the full SHA
    83767d5 View commit details
    Browse the repository at this point in the history

  8. [Truffle] Missed a field in the copy constructor.

    @nirvdrum
    nirvdrum committed Apr 29, 2015
    Configuration menu
    Copy the full SHA
    804986d View commit details
    Browse the repository at this point in the history

  9. [Truffle] Add logger to stdlib.

    @bjfish
    bjfish committed Apr 29, 2015
    Configuration menu
    Copy the full SHA
    cca7c7e View commit details
    Browse the repository at this point in the history

  10. [Truffle] Adding stringscanner specs with tags.

    @bjfish
    bjfish committed Apr 29, 2015
    Configuration menu
    Copy the full SHA
    edec82e View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' into truffle-head 

    Conflicts:
	truffle/src/main/java/org/jruby/truffle/nodes/core/BignumNodes.java
    @chrisseaton
    chrisseaton committed Apr 29, 2015
    Configuration menu
    Copy the full SHA
    33fb8c5 View commit details
    Browse the repository at this point in the history

  12. [Truffle] Update to 0.7

    @chrisseaton
    chrisseaton committed Apr 29, 2015
    Configuration menu
    Copy the full SHA
    c28f4ce View commit details
    Browse the repository at this point in the history