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: 25cc7a0ee029
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9addd60ece7e
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 27, 2018

  1. Add ripper to sync files.

    @headius
    headius committed Mar 27, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    headius Charles Oliver Nutter
    GPG key ID: 8E26FF248BC7AEAD
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7a3f78c View commit details

  2. Add io/console/size.rb from io/console etc. 

    Fixes rails/rails#32318
    @headius
    headius committed Mar 27, 2018
    Copy the full SHA
    9addd60 View commit details
Showing with 7 additions and 3 deletions.
  1. +4 −1 tool/globals_2_4_1.rb
  2. +3 −2 tool/sync_ruby
5 changes: 4 additions & 1 deletion tool/globals_2_4_1.rb
View file
Original file line number Diff line number Diff line change
@@ -84,5 +84,8 @@
'ext/socket/lib/socket.rb' => 'socket.rb',
'ext/win32/lib/win32' => 'win32',
'ext/fiddle/lib/fiddle.rb' => 'fiddle.rb',
'ext/fiddle/lib/fiddle' => 'fiddle'
'ext/fiddle/lib/fiddle' => 'fiddle',
'ext/ripper/lib/ripper' => 'ripper',
'ext/ripper/lib/ripper.rb' => 'ripper.rb',
'ext/io/console/lib/console' => 'io/console'
}
5 changes: 3 additions & 2 deletions tool/sync_ruby
View file
Original file line number Diff line number Diff line change
@@ -53,8 +53,9 @@ class Sync
end

for file, target in EXT_FILES
if File.directory? "#{@source}/#{file}"
cp_r "#{@source}/#{file}", "#{@target}/lib/ruby/stdlib/", :verbose => true
if file !~ /.rb$/
mkdir_p "#{@source}/#{file}"
cp_r "#{@source}/#{file}", "#{@target}/lib/ruby/stdlib/#{target}/..", :verbose => true
else
cp_r "#{@source}/#{file}", "#{@target}/lib/ruby/stdlib/#{target}", :verbose => true
end