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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f8a868cd4c53
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5ef32534fb98
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Feb 5, 2015

  1. Fix required arguments for File.chown

    @lumeet
    lumeet committed Feb 5, 2015
    Copy the full SHA
    49bcb54 View commit details

Commits on Feb 6, 2015

  1. Merge pull request #2569 from lumeet/file_chown 

    Fix required arguments for File.chown
    @enebo
    enebo committed Feb 6, 2015
    Copy the full SHA
    5ef3253 View commit details
Showing with 1 addition and 2 deletions.
  1. +1 −1 core/src/main/java/org/jruby/RubyFile.java
  2. +0 −1 test/mri/excludes/TestFile.rb
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/RubyFile.java
View file
Original file line number Diff line number Diff line change
@@ -586,7 +586,7 @@ public static IRubyObject chmod(ThreadContext context, IRubyObject recv, IRubyOb
return runtime.newFixnum(count);
}

@JRubyMethod(required = 3, rest = true, meta = true)
@JRubyMethod(required = 2, rest = true, meta = true)
public static IRubyObject chown(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
Ruby runtime = context.runtime;

1 change: 0 additions & 1 deletion test/mri/excludes/TestFile.rb
View file
Original file line number Diff line number Diff line change
@@ -7,6 +7,5 @@
exclude :test_gets_para_extended_file , "needs investigation"
exclude :test_open_nul, "needs investigation"
exclude :test_read_all_extended_file , "needs investigation"
exclude :test_s_chown , "needs investigation"
exclude :test_stat , "birthtime does not match MRI behavior (#2152)"
exclude :test_truncate_wbuf, "fails on Linux"