From e11e3344ea07cb10f74f6232261b591132a98812 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Jan 2023 11:01:34 +0000 Subject: [PATCH 1/2] Bump mail from 2.7.1 to 2.8.0.1 Bumps [mail](https://github.com/mikel/mail) from 2.7.1 to 2.8.0.1. - [Release notes](https://github.com/mikel/mail/releases) - [Changelog](https://github.com/mikel/mail/blob/master/CHANGELOG.rdoc) - [Commits](https://github.com/mikel/mail/compare/2.7.1...2.8.0.1) --- updated-dependencies: - dependency-name: mail dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 65c631563..65c17e5ab 100644 --- a/Gemfile +++ b/Gemfile @@ -10,7 +10,7 @@ gem "govuk_app_config" gem "govuk_personalisation" gem "govuk_publishing_components" gem "htmlentities" -gem "mail", "~> 2.7.1" # TODO: remove once https://github.com/mikel/mail/issues/1489 is fixed. +gem "mail", "~> 2.8.0" # TODO: remove once https://github.com/mikel/mail/issues/1489 is fixed. gem "plek" gem "rails-controller-testing" gem "rails-i18n" diff --git a/Gemfile.lock b/Gemfile.lock index f152220a0..6c041f032 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -185,8 +185,11 @@ GEM loofah (2.19.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.7.1) + mail (2.8.0.1) mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp marcel (1.0.2) matrix (0.4.2) method_source (1.0.0) @@ -409,7 +412,7 @@ DEPENDENCIES govuk_test htmlentities i18n-coverage - mail (~> 2.7.1) + mail (~> 2.8.0) minitest-reporters mocha plek From c91b25797bb31fee776272b190a163a4ac442bdc Mon Sep 17 00:00:00 2001 From: chao-xian Date: Tue, 17 Jan 2023 10:52:34 +0000 Subject: [PATCH 2/2] Remove pinning mail gem Issue that made us do it is gone [1] [1]: https://github.com/mikel/mail/issues/1489 --- Gemfile | 1 - Gemfile.lock | 1 - 2 files changed, 2 deletions(-) diff --git a/Gemfile b/Gemfile index 65c17e5ab..38a19fa1a 100644 --- a/Gemfile +++ b/Gemfile @@ -10,7 +10,6 @@ gem "govuk_app_config" gem "govuk_personalisation" gem "govuk_publishing_components" gem "htmlentities" -gem "mail", "~> 2.8.0" # TODO: remove once https://github.com/mikel/mail/issues/1489 is fixed. gem "plek" gem "rails-controller-testing" gem "rails-i18n" diff --git a/Gemfile.lock b/Gemfile.lock index 6c041f032..81849e215 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -412,7 +412,6 @@ DEPENDENCIES govuk_test htmlentities i18n-coverage - mail (~> 2.8.0) minitest-reporters mocha plek