From a0bb40c0b6fd3f56a114fcc415a68e45adaed5f2 Mon Sep 17 00:00:00 2001 From: Peter Hartshorn Date: Wed, 3 Nov 2021 16:59:39 +0000 Subject: [PATCH 1/2] Bump Rails Translation Manager `bundle update rails_translation_manager` Also bundles `rails_translation_manager` as test / dev dependency. --- Gemfile | 2 +- Gemfile.lock | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 8502a53ae..e5015d921 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,6 @@ gem "plek" gem "rack_strip_client_ip" gem "rails-controller-testing" gem "rails-i18n" -gem "rails_translation_manager" gem "sassc-rails" gem "slimmer" gem "uglifier" @@ -22,6 +21,7 @@ group :development, :test do gem "govuk_test" gem "jasmine" gem "jasmine_selenium_runner" + gem "rails_translation_manager" gem "rubocop-govuk" end diff --git a/Gemfile.lock b/Gemfile.lock index 1b43850f7..d1600afa2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -163,7 +163,7 @@ GEM http-accept (1.7.0) http-cookie (1.0.4) domain_name (~> 0.5) - i18n (1.8.10) + i18n (1.8.11) concurrent-ruby (~> 1.0) i18n-coverage (0.2.0) i18n-tasks (0.9.34) @@ -236,7 +236,7 @@ GEM public_suffix (4.0.6) puma (5.3.2) nio4r (~> 2.0) - racc (1.5.2) + racc (1.6.0) rack (2.2.3) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -268,8 +268,9 @@ GEM rails-i18n (6.0.0) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 7) - rails_translation_manager (0.1.0) + rails_translation_manager (1.1.0) activesupport + i18n-tasks rails-i18n railties (6.1.4.1) actionpack (= 6.1.4.1) @@ -402,7 +403,7 @@ GEM thor xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.4.2) + zeitwerk (2.5.1) PLATFORMS ruby From 59422685440e96c2a3be78437da357434741547d Mon Sep 17 00:00:00 2001 From: Peter Hartshorn Date: Wed, 3 Nov 2021 17:09:55 +0000 Subject: [PATCH 2/2] Remove explicit bundle of i18n-tasks This is already bundled as part of rails_translation_manager. --- Gemfile | 1 - Gemfile.lock | 1 - 2 files changed, 2 deletions(-) diff --git a/Gemfile b/Gemfile index e5015d921..eec0e26c8 100644 --- a/Gemfile +++ b/Gemfile @@ -28,7 +28,6 @@ end group :development do gem "better_errors" gem "binding_of_caller" - gem "i18n-tasks" gem "pry" gem "wraith" end diff --git a/Gemfile.lock b/Gemfile.lock index d1600afa2..7e7aa585f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -422,7 +422,6 @@ DEPENDENCIES govuk_test htmlentities i18n-coverage - i18n-tasks jasmine jasmine_selenium_runner minitest-reporters