From c7076ef2a06ea30d271b979ad16cb4a3a504c6ab Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 28 Jun 2020 19:21:24 +0100 Subject: [PATCH] Revert "Bump rails-i18n from 4.0.2 to 6.0.0" This reverts commit a6d8043dc25d213f9c6ee397f586ffd97a90c164. --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 35058f334..5a2c5792a 100644 --- a/Gemfile +++ b/Gemfile @@ -54,7 +54,7 @@ gem "i18n-js", ">= 3.0.0" gem "oauth-plugin", ">= 0.5.1" gem "openstreetmap-deadlock_retry", ">= 1.3.0", :require => "deadlock_retry" gem "rack-cors" -gem "rails-i18n", "~> 6.0.0" +gem "rails-i18n", "~> 4.0.0" gem "rinku", ">= 2.0.6", :require => "rails_rinku" gem "strong_migrations" gem "validates_email_format_of", ">= 1.5.1" diff --git a/Gemfile.lock b/Gemfile.lock index d0155bcd0..3f03eca58 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -220,7 +220,7 @@ GEM html_tokenizer (0.0.7) htmlentities (4.3.4) http_accept_language (2.1.1) - i18n (1.8.3) + i18n (0.9.5) concurrent-ruby (~> 1.0) i18n-js (3.7.0) i18n (>= 0.6.6) @@ -365,9 +365,9 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - rails-i18n (6.0.0) - i18n (>= 0.7, < 2) - railties (>= 6.0.0, < 7) + rails-i18n (4.0.2) + i18n (~> 0.6) + rails (>= 4.0) railties (6.0.3.2) actionpack (= 6.0.3.2) activesupport (= 6.0.3.2) @@ -534,7 +534,7 @@ DEPENDENCIES rack-uri_sanitizer rails (= 6.0.3.2) rails-controller-testing - rails-i18n (~> 6.0.0) + rails-i18n (~> 4.0.0) rinku (>= 2.0.6) rotp rubocop -- 2.39.5