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

Commits on Apr 13, 2018

  1. update jcodings

    @lopex
    lopex committed Apr 13, 2018
    Copy the full SHA
    f20c4e6 View commit details

  2. Merge branch 'master' of https://github.com/jruby/jruby

    @lopex
    lopex committed Apr 13, 2018
    Copy the full SHA
    de4e6cd View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 core/pom.rb
  2. +1 −1 core/pom.xml
2 changes: 1 addition & 1 deletion core/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -53,7 +53,7 @@

jar 'org.jruby.joni:joni:2.1.15'
jar 'org.jruby.extras:bytelist:1.0.15'
jar 'org.jruby.jcodings:jcodings:1.0.27'
jar 'org.jruby.jcodings:jcodings:1.0.29'
jar 'org.jruby:dirgra:0.3'

jar 'com.headius:invokebinder:1.11'
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -182,7 +182,7 @@ DO NOT MODIFIY - GENERATED CODE
<dependency>
<groupId>org.jruby.jcodings</groupId>
<artifactId>jcodings</artifactId>
<version>1.0.27</version>
<version>1.0.29</version>
</dependency>
<dependency>
<groupId>org.jruby</groupId>