[arvados] updated: 2.6.0-1200-g905c83db0b
git repository hosting
git at public.arvados.org
Wed Aug 30 13:06:30 UTC 2023
Summary of changes:
apps/workbench/Gemfile | 3 +++
apps/workbench/Gemfile.lock | 3 ++-
services/api/Gemfile | 3 +++
services/api/Gemfile.lock | 3 ++-
4 files changed, 10 insertions(+), 2 deletions(-)
via 905c83db0b70400bd596388f5b3676adedcf8eb0 (commit)
from 0043311bd95a8da91d0cc774542e7b008da46a42 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 905c83db0b70400bd596388f5b3676adedcf8eb0
Author: Tom Clegg <tom at curii.com>
Date: Wed Aug 30 09:05:02 2023 -0400
20862: Revert i18n to earlier version for rails 5 compatibility.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile
index 5c69fc9f32..5d3cd5c099 100644
--- 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 204456e199..a10c05f8bb 100644
--- 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 b1f6485436..adfaa2ecb5 100644
--- 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 61f4c4a574..a7d46a14a8 100644
--- 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
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list