Merge branch '50-stable' into 51-stable

enebo · enebo · commit 3519517dc6a6 · 2019-01-21T11:08:12.000-06:00
diff --git a/.travis.yml b/.travis.yml
@@ -59,20 +59,20 @@ matrix:
     - rvm: jruby-head
   include:
     # jruby-9.2
-    - rvm: jruby-9.2.4.0
+    - rvm: jruby-9.2.5.0
       env: DB=mysql2
-    - rvm: jruby-9.2.4.0
+    - rvm: jruby-9.2.5.0
       env: DB=postgresql
-    - rvm: jruby-9.2.4.0
+    - rvm: jruby-9.2.5.0
       env: DB=sqlite3
     # jruby-9.2 + Java 11
-    - rvm: jruby-9.2.4.0
+    - rvm: jruby-9.2.5.0
       env: DB=mysql2
       jdk: openjdk11
-    - rvm: jruby-9.2.4.0
+    - rvm: jruby-9.2.5.0
       env: DB=postgresql
       jdk: openjdk11
-    - rvm: jruby-9.2.4.0
+    - rvm: jruby-9.2.5.0
       env: DB=sqlite3
       jdk: openjdk11
     # jruby-head
diff --git a/test/rails/excludes/mysql2/TimePrecisionTest.rb b/test/rails/excludes/mysql2/TimePrecisionTest.rb
@@ -0,0 +1 @@
+exclude :test_time_precision_is_truncated_on_assignment, 'Intermittent test failures, double rounding problem?'
diff --git a/test/rails/excludes/postgresql/TimePrecisionTest.rb b/test/rails/excludes/postgresql/TimePrecisionTest.rb
@@ -0,0 +1 @@
+exclude :test_time_precision_is_truncated_on_assignment, 'Intermittent test failures, double rounding problem?'
diff --git a/test/rails/excludes/sqlite3/TimePrecisionTest.rb b/test/rails/excludes/sqlite3/TimePrecisionTest.rb
@@ -0,0 +1 @@
+exclude :test_time_precision_is_truncated_on_assignment, 'Intermittent test failures, double rounding problem?'

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+exclude :test_time_precision_is_truncated_on_assignment, 'Intermittent test failures, double rounding problem?'`