Merge branch 'master' of github.com:reactjs/react-rails

Author: BookOfGreg

.travis.yml

@@ -21,7 +21,7 @@ gemfile:
   # These don't have webpacker:
   - gemfiles/rails_3.2.gemfile
   - gemfiles/rails_4.0.5.gemfile
-  - gemfiles/rails_4.0_with_therubyracer.gemfile
+  - gemfiles/rails_4.0_with_mini_racer.gemfile
   - gemfiles/rails_4.1.gemfile
   - gemfiles/rails_4.2_sprockets_2.gemfile
   - gemfiles/rails_4.2_sprockets_3.gemfile
@@ -31,12 +31,13 @@ gemfile:
 matrix:
   fast_finish: true
   exclude:
+    # all except rails_4.1 skipped on 2.1
     - rvm: 2.1
       gemfile: gemfiles/rails_3.2.gemfile
     - rvm: 2.1
       gemfile: gemfiles/rails_4.0.5.gemfile
     - rvm: 2.1
-      gemfile: gemfiles/rails_4.0_with_therubyracer.gemfile
+      gemfile: gemfiles/rails_4.0_with_mini_racer.gemfile
     - rvm: 2.1
       gemfile: gemfiles/rails_4.2_sprockets_2.gemfile
     - rvm: 2.1
@@ -55,22 +56,23 @@ matrix:
       gemfile: gemfiles/rails_5_no_sprockets.gemfile
     - rvm: 2.1
       gemfile: gemfiles/rails_5.1_sprockets_4.gemfile
+    # all except 5.1_sprockets_4, 5.1_webpacker_3, 4.2_sprockets_3, and 3.2 skipped on jruby
     - rvm: jruby-9.1.9.0
-      gemfile: gemfiles/rails_4.0.gemfile
-    - rvm: jruby-9.1.9.0
-      gemfile: rails_4.0_with_therubyracer.gemfile
-    - rvm: jruby-9.1.9.0
-      gemfile: gemfiles/rails_4.1.gemfile
-    - rvm: jruby-9.1.9.0
-      gemfile: gemfiles/rails_4.2_sprockets_2.gemfile
+      gemfile: gemfiles/rails_4.2_sprockets_4.gemfile
     - rvm: jruby-9.1.9.0
       gemfile: gemfiles/rails_5_no_sprockets_webpacker_1_1.gemfile
     - rvm: jruby-9.1.9.0
       gemfile: gemfiles/rails_5_no_sprockets_webpacker_1_x.gemfile
     - rvm: jruby-9.1.9.0
       gemfile: gemfiles/rails_5_no_sprockets_webpacker_2.gemfile
     - rvm: jruby-9.1.9.0
-      gemfile: gemfiles/rails_5_no_sprockets_webpacker_3.gemfile
+      gemfile: gemfiles/rails_4.0.5.gemfile
+    - rvm: jruby-9.1.9.0
+      gemfile: gemfiles/rails_4.0_with_mini_racer.gemfile
+    - rvm: jruby-9.1.9.0
+      gemfile: gemfiles/rails_4.1.gemfile
+    - rvm: jruby-9.1.9.0
+      gemfile: gemfiles/rails_4.2_sprockets_2.gemfile
     - rvm: jruby-9.1.9.0
       gemfile: gemfiles/rails_5_no_sprockets.gemfile
 

gemfiles/rails_4.0_with_therubyracer.gemfile

@@ -1316,6 +1316,12 @@ react_ujs@^2.4.1, react_ujs@^2.4.2:
   dependencies:
     react_ujs "^2.4.1"
 
+react_ujs@^2.4.2:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/react_ujs/-/react_ujs-2.4.2.tgz#c09365579b1c7b2191eab5a57f007609fd1852ba"
+  dependencies:
+    react_ujs "^2.4.1"
+
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"