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: 0878ef089df7
Choose a base ref
...
head repository: jruby/jruby
compare: 7edda4828667
Choose a head ref
  • 10 commits
  • 9 files changed
  • 3 contributors

Commits on Dec 2, 2014

  1. fix File.readable? when native is disabled 

    this readable? method now follows the same pattern as writable?, file?,
directory? and exists? and uses the respective FileResource directly.

fixes #2040 and #1983

Sponsored by Lookout Inc.
    @mkristian
    mkristian committed Dec 2, 2014
    Copy the full SHA
    8a5ea5c View commit details
    Browse the repository at this point in the history

  2. get better pattern matching for uri-like path for jirb 

    if the path to jruby-complete.jar contains a space the various
uri-like path strings do not match (file: or no protocol, ' ' or '%20')
should be treated equaly.

Sponsored by Lookout Inc.
    @mkristian
    mkristian committed Dec 2, 2014
    Copy the full SHA
    329bad2 View commit details
    Browse the repository at this point in the history

  3. If presumed URI does not decode, it's not a URI. Fixes #2264.

    @headius
    headius committed Dec 2, 2014
    Copy the full SHA
    f0aaf44 View commit details
    Browse the repository at this point in the history

  4. Add a spec:ruby:fast target that avoids subprocess-spawning specs. 

    Conflicts:
	rakelib/rubyspec.rake
    @headius
    headius committed Dec 2, 2014
    Copy the full SHA
    179811e View commit details
    Browse the repository at this point in the history

  5. Update list of slow language specs.

    @eregon @headius
    eregon authored and headius committed Dec 2, 2014
    Copy the full SHA
    74f8381 View commit details
    Browse the repository at this point in the history

  6. Add fast rubyspec for 1.8 mode and make travis use them.

    @headius
    headius committed Dec 2, 2014
    Copy the full SHA
    0167f3f View commit details
    Browse the repository at this point in the history

  7. Peel off options hash passed to Open3.popen3. 

    Fixes #1290.
Fixes #1547.
    @headius
    headius committed Dec 2, 2014
    Copy the full SHA
    66b2905 View commit details
    Browse the repository at this point in the history

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

    Conflicts:
	.travis.yml
	antlib/spec.xml
	rakelib/rubyspec.rake
	spec/jruby.1.8.mspec
    @headius
    headius committed Dec 2, 2014
    Copy the full SHA
    45a7e3e View commit details
    Browse the repository at this point in the history

  9. Update to RubyGems 2.4.4.

    @headius
    headius committed Dec 2, 2014
    Copy the full SHA
    6ba7c41 View commit details
    Browse the repository at this point in the history

  10. Apply fix from rubygems/rubygems@d96c57c temporarily on master.

    @headius
    headius committed Dec 2, 2014
    Copy the full SHA
    7edda48 View commit details
    Browse the repository at this point in the history