-
-
Notifications
You must be signed in to change notification settings - Fork 925
Comparing changes
Open a pull request
base repository: jruby/jruby
base: 4bc75fcba220
head repository: jruby/jruby
compare: 314295c23373
Commits on Apr 16, 2015
-
Configuration menu - View commit details
-
Copy full SHA for c384fd0 - Browse repository at this point
Copy the full SHA c384fd0View commit details
Commits on Apr 20, 2015
-
Transplant recent LoadService fixes from master.
* Fix autoload in the presence of canonicalized paths * Fix require locking in the presence of canonicalized paths * Fix circular require warning setting $!
Configuration menu - View commit details
-
Copy full SHA for 1735752 - Browse repository at this point
Copy the full SHA 1735752View commit details
Commits on Apr 21, 2015
-
Configuration menu - View commit details
-
Copy full SHA for 7f28c67 - Browse repository at this point
Copy the full SHA 7f28c67View commit details -
Always do this check; does not appear to break test_pid anymore.
This should help bring popen behavior in line with MRI per rails/rails#19777.
Configuration menu - View commit details
-
Copy full SHA for 821bb77 - Browse repository at this point
Copy the full SHA 821bb77View commit details -
[Truffle] Refactor a good part of Module concerning visibility.
* @coremethod with "private" names are now automatically private. * At last, proper implementation of Module.{public_,private_,protected_,}methods.
Configuration menu - View commit details
-
Copy full SHA for 06c53b9 - Browse repository at this point
Copy the full SHA 06c53b9View commit details -
[Truffle] Remove abstract non-DSL execute methods in cast and coerce …
…nodes. * They are generated by the DSL anyway and likely remnants when they were not yet DSL nodes. * execute() is the same when generated, with just an extra try/catch. * Keep the execute with evaluated values above specializations for consistency.
Configuration menu - View commit details
-
Copy full SHA for b24e393 - Browse repository at this point
Copy the full SHA b24e393View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6f90864 - Browse repository at this point
Copy the full SHA 6f90864View commit details -
* Peel off leading env hash * Peel off options * Process coercions correctly Helps get the case from rails/rails#19777 running right.
Configuration menu - View commit details
-
Copy full SHA for 30cd6e8 - Browse repository at this point
Copy the full SHA 30cd6e8View commit details -
Configuration menu - View commit details
-
Copy full SHA for 5c93efa - Browse repository at this point
Copy the full SHA 5c93efaView commit details -
Configuration menu - View commit details
-
Copy full SHA for 7d240aa - Browse repository at this point
Copy the full SHA 7d240aaView commit details -
Configuration menu - View commit details
-
Copy full SHA for 260cae0 - Browse repository at this point
Copy the full SHA 260cae0View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8e040f6 - Browse repository at this point
Copy the full SHA 8e040f6View commit details -
Configuration menu - View commit details
-
Copy full SHA for 214dea5 - Browse repository at this point
Copy the full SHA 214dea5View commit details -
Re-fix searching of prepended modules-in-a-module. Fixes #2864.
The original problem was that we only searched the target module's method table, which is empty in the presence of prepends. The new issue was that my depth-limiting fix to IncludedModuleWrapper's searchMethodCommon did not start from the right place (`this` instead of `origin`) and the condition was not right.
Configuration menu - View commit details
-
Copy full SHA for b9473af - Browse repository at this point
Copy the full SHA b9473afView commit details -
Configuration menu - View commit details
-
Copy full SHA for e5e5198 - Browse repository at this point
Copy the full SHA e5e5198View commit details -
Configuration menu - View commit details
-
Copy full SHA for ab3b1d5 - Browse repository at this point
Copy the full SHA ab3b1d5View commit details -
Fix edge case in findMethodInstanceContainer codeo
* Looks like we can have scenarios where 'self' for a closure executed in a module_eval context need not be the module but a different object. In that case, we still need to add the method to self => we need to get its metaclass first. * This fixes crasher in this case: ------------- require "minitest/autorun" describe "A" do it "should do something" do def foo end end end -------------
Configuration menu - View commit details
-
Copy full SHA for c2f66f2 - Browse repository at this point
Copy the full SHA c2f66f2View commit details -
Document the edge case in a FIXME as caused by define_method use
* We should rip out the fix when we update the define_method implementation to convert those blocks to real method scopes.
Configuration menu - View commit details
-
Copy full SHA for b65a584 - Browse repository at this point
Copy the full SHA b65a584View commit details
Commits on Apr 22, 2015
-
8
Configuration menu - View commit details
-
Copy full SHA for b57c48b - Browse repository at this point
Copy the full SHA b57c48bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 4a947d4 - Browse repository at this point
Copy the full SHA 4a947d4View commit details -
Configuration menu - View commit details
-
Copy full SHA for 336ed58 - Browse repository at this point
Copy the full SHA 336ed58View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2bea720 - Browse repository at this point
Copy the full SHA 2bea720View commit details -
Revert "Remove a couple working excludes."
This reverts commit e7c7beb.
Configuration menu - View commit details
-
Copy full SHA for 6dca372 - Browse repository at this point
Copy the full SHA 6dca372View commit details -
Configuration menu - View commit details
-
Copy full SHA for a60bd1f - Browse repository at this point
Copy the full SHA a60bd1fView commit details -
Configuration menu - View commit details
-
Copy full SHA for f0579bc - Browse repository at this point
Copy the full SHA f0579bcView commit details -
Configuration menu - View commit details
-
Copy full SHA for eab2354 - Browse repository at this point
Copy the full SHA eab2354View commit details -
Merge remote-tracking branch 'origin/jruby-1_7'
Conflicts: core/src/main/java/org/jruby/RubyIO.java core/src/main/java/org/jruby/runtime/ThreadContext.java core/src/main/java/org/jruby/runtime/load/LoadService.java core/src/main/java/org/jruby/util/TypeConverter.java lib/pom.rb
Configuration menu - View commit details
-
Copy full SHA for 0b01058 - Browse repository at this point
Copy the full SHA 0b01058View commit details -
Configuration menu - View commit details
-
Copy full SHA for f90af5a - Browse repository at this point
Copy the full SHA f90af5aView commit details -
Configuration menu - View commit details
-
Copy full SHA for db0bd4e - Browse repository at this point
Copy the full SHA db0bd4eView commit details -
[Truffle] Ensure to produce some output for Travis with MSpec.
* Remove old unused options.
Configuration menu - View commit details
-
Copy full SHA for 04c17ec - Browse repository at this point
Copy the full SHA 04c17ecView commit details -
Merge branch 'master' into truffle-io
Conflicts: truffle/src/main/java/org/jruby/truffle/translator/BodyTranslator.java
Configuration menu - View commit details
-
Copy full SHA for e08fd5f - Browse repository at this point
Copy the full SHA e08fd5fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 12ad44e - Browse repository at this point
Copy the full SHA 12ad44eView commit details -
Configuration menu - View commit details
-
Copy full SHA for e8835c0 - Browse repository at this point
Copy the full SHA e8835c0View commit details -
Configuration menu - View commit details
-
Copy full SHA for 08f528f - Browse repository at this point
Copy the full SHA 08f528fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 314295c - Browse repository at this point
Copy the full SHA 314295cView commit details
There are no files selected for viewing
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.