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: fec1f7a71235
Choose a base ref
...
head repository: jruby/jruby
compare: 62ac0030aaec
Choose a head ref
  • 6 commits
  • 7 files changed
  • 1 contributor

Commits on Feb 10, 2015

  1. fixes directory glob inside jarfile with + in filename 

    when you have embedded gems inside a jarfile and the filename was something
like myjar-20150210+behappy.jar then the rubygems could not find those gems.

Sponsored by Lookout Inc.
    @mkristian
    mkristian committed Feb 10, 2015
    2
    Copy the full SHA
    d220103 View commit details
    Browse the repository at this point in the history

  2. improve the case when the path for a jar-file needs to be URL-decoded 

    it removes the case my.jar!/f%20o.rb which matches the behaviour of
file:f%20o.rb

Sponsored by Lookout Inc.
    @mkristian
    mkristian committed Feb 10, 2015
    Copy the full SHA
    f3d806d View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2015

  1. expands path for new load tests

    @mkristian
    mkristian committed Feb 11, 2015
    Copy the full SHA
    ee68c63 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2015

  1. get runnable test green again

    @mkristian
    mkristian committed Feb 12, 2015
    Copy the full SHA
    b14661c View commit details
    Browse the repository at this point in the history

  2. simplify runnable integration test

    @mkristian
    mkristian committed Feb 12, 2015
    Copy the full SHA
    2f08882 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'jruby-1_7' 

    Conflicts:
	test/test_load.rb
    @mkristian
    mkristian committed Feb 12, 2015
    Copy the full SHA
    62ac003 View commit details
    Browse the repository at this point in the history