20862: Revert i18n to earlier version for rails 5 compatibility.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile
index 5c69fc9f3291842ad0682a2331f58ab7e8cb2703..5d3cd5c0996548859390d9fcbfb00065b8b275bb 100644 (file)
--- a/apps/workbench/Gemfile
+++ b/apps/workbench/Gemfile
@@ -7,6 +7,9 @@ source 'https://rubygems.org'
 gem 'rails', '~> 5.2.0'
 gem 'arvados', '~> 2.7.0.rc1'
 
+# i18n 1.14.1 seems to be incompatible with rails 5
+gem 'i18n', '~> 0.9.5'
+
 gem 'activerecord-nulldb-adapter', git: 'https://github.com/arvados/nulldb'
 gem 'multi_json'
 gem 'oj'

diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index 204456e199eb55f1b4fee92001c55b16d372fed6..a10c05f8bb32b3598f6e29c98ec19581350f060c 100644 (file)
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -142,7 +142,7 @@ GEM
     headless (1.0.2)
     highline (2.0.2)
     httpclient (2.8.3)
-    i18n (1.14.1)
+    i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     jquery-rails (4.5.1)
       rails-dom-testing (>= 1, < 3)
@@ -330,6 +330,7 @@ DEPENDENCIES
   flamegraph
   headless (~> 1.0.2)
   httpclient (~> 2.5)
+  i18n (~> 0.9.5)
   jquery-rails
   launchy (~> 2.4.0)
   lograge

diff --git a/services/api/Gemfile b/services/api/Gemfile
index b1f648543608432a5e20fba241d7c57a91c251a1..adfaa2ecb5de65c21522bf7aea1f7fed44fcb075 100644 (file)
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -7,6 +7,9 @@ source 'https://rubygems.org'
 gem 'rails', '~> 5.2.0'
 gem 'responders', '~> 2.0'
 
+# i18n 1.14.1 seems to be incompatible with rails 5
+gem 'i18n', '~> 0.9.5'
+
 # Pin sprockets to < 4.0 to avoid issues when upgrading rails to 5.2
 # See: https://github.com/rails/sprockets-rails/issues/443
 gem 'sprockets', '~> 3.0'

diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index 61f4c4a574a6f30219c5201838ad2b76e0fb62ea..a7d46a14a8bb2b0198ad4eb70b49be2ac5ab719a 100644 (file)
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -112,7 +112,7 @@ GEM
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     httpclient (2.8.3)
-    i18n (1.14.1)
+    i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     jquery-rails (4.5.1)
       rails-dom-testing (>= 1, < 3)
@@ -247,6 +247,7 @@ DEPENDENCIES
   byebug
   factory_bot_rails
   httpclient
+  i18n (~> 0.9.5)
   jquery-rails
   listen
   lograge