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

Commits on Jun 22, 2015

  1. fix creating FileResource with CWD a uri-like path and path a regular… 

    … file

if the path is an absolute path to regular file and the CWD is using a
uri:classloader:/ then the absolute path on the filesystem "wins"

fixes #3071

Sponsored by Lookout Inc.
    @mkristian
    mkristian committed Jun 22, 2015
    Configuration menu
    Copy the full SHA
    edac27b View commit details
    Browse the repository at this point in the history

  2. upgrade jar-dependencies to avoid maven completely on require_jar 

    fixes #3074
    @mkristian
    mkristian committed Jun 22, 2015
    Configuration menu
    Copy the full SHA
    0cce926 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'jruby-1_7' 

    Conflicts:
	core/src/main/java/org/jruby/util/JRubyFile.java
	lib/pom.rb
	test/test_file.rb
    @mkristian
    mkristian committed Jun 22, 2015
    Configuration menu
    Copy the full SHA
    1f9aac5 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2015

  1. Merge branch 'master' of github.com:jruby/jruby

    @mkristian
    mkristian committed Jun 23, 2015
    Configuration menu
    Copy the full SHA
    5a08be6 View commit details
    Browse the repository at this point in the history