From dc99dbda5fab8a1288045760ae69457312cf742c Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Sun, 2 Apr 2023 16:50:25 -0700
Subject: [PATCH] Update gitlab-mail_room to v0.0.23
This version is already used by GitLab Omnibus and Cloud Native
GitLab, but we had to avoid updating this dependency in GitLab Rails
due to the need to depend on an updated net-imap gem
(https://docs.gitlab.com/ee/development/emails.html#rationale). Now
that we've updated to Ruby 3.0.5, we can safely bump this version.
This version bump is also needed for Ruby 3.1 compatibility.
Changelog: changed
---
Gemfile | 2 +-
Gemfile.checksum | 3 +--
Gemfile.lock | 7 +++++--
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/Gemfile b/Gemfile
index f01bd0b94e684..b7be6634f6f50 100644
--- a/Gemfile
+++ b/Gemfile
@@ -477,7 +477,7 @@ gem 'octokit', '~> 4.15'
# Updating this gem version here is deprecated. See:
# https://docs.gitlab.com/ee/development/emails.html#mailroom-gem-updates
-gem 'gitlab-mail_room', '~> 0.0.9', require: 'mail_room'
+gem 'gitlab-mail_room', '~> 0.0.23', require: 'mail_room'
gem 'email_reply_trimmer', '~> 0.1'
gem 'html2text'
diff --git a/Gemfile.checksum b/Gemfile.checksum
index 22e05576ba136..9443c0f384d90 100644
--- a/Gemfile.checksum
+++ b/Gemfile.checksum
@@ -212,10 +212,9 @@
{"name":"gitlab-fog-azure-rm","version":"1.7.0","platform":"ruby","checksum":"969c67943c54ad4c259a6acd040493f13922fbdf2211bb4eca00e71505263dc2"},
{"name":"gitlab-labkit","version":"0.31.1","platform":"ruby","checksum":"3e3a39370966b5d2739c2d9d9005c0ea27541d32cb7292e856e8bd74c720bffb"},
{"name":"gitlab-license","version":"2.2.1","platform":"ruby","checksum":"39fcf6be8b2887df8afe01b5dcbae8d08b7c5d937ff56b0fb40484a8c4f02d30"},
-{"name":"gitlab-mail_room","version":"0.0.9","platform":"ruby","checksum":"6700374b5c0aa9d9ad4e711aeb677f0b7d415a6d01d3baa699efab25349d851c"},
+{"name":"gitlab-mail_room","version":"0.0.23","platform":"ruby","checksum":"23564fa4dab24ec5011d4c64a801fc0228301d5b0f046a26a1d8e96e36c19997"},
{"name":"gitlab-markup","version":"1.9.0","platform":"ruby","checksum":"7eda045a08ec2d110084252fa13a8c9eac8bdac0e302035ca7db4b82bcbd7ed4"},
{"name":"gitlab-net-dns","version":"0.9.1","platform":"ruby","checksum":"bcd1a08dcb31b731e8ff602d828de619d2d9f53f5812f6abacf11c720873d4cb"},
-{"name":"gitlab-sidekiq-fetcher","version":"0.9.0","platform":"ruby","checksum":"54041aec059f20c8e6dfce394e1b60e0c0a9c7cef32da912a58abbd333e13897"},
{"name":"gitlab-styles","version":"10.0.0","platform":"ruby","checksum":"8a1b20f7b5f351605ff4ed4ec648ef37226f2774d1e1377ed99389448d6913f0"},
{"name":"gitlab_chronic_duration","version":"0.10.6.2","platform":"ruby","checksum":"6dda4cfe7dca9b958f163ac8835c3d9cc70cf8df8cbb89bb2fbf9ba4375105fb"},
{"name":"gitlab_omniauth-ldap","version":"2.2.0","platform":"ruby","checksum":"bb4d20acb3b123ed654a8f6a47d3fac673ece7ed0b6992edb92dca14bad2838c"},
diff --git a/Gemfile.lock b/Gemfile.lock
index 2bc26a095ad7b..61ccb3112dc18 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -617,7 +617,10 @@ GEM
pg_query (~> 2.1)
redis (> 3.0.0, < 6.0.0)
gitlab-license (2.2.1)
- gitlab-mail_room (0.0.9)
+ gitlab-mail_room (0.0.23)
+ jwt (>= 2.0)
+ net-imap (>= 0.2.1)
+ oauth2 (>= 1.4.4, < 3)
gitlab-markup (1.9.0)
gitlab-net-dns (0.9.1)
gitlab-styles (10.0.0)
@@ -1738,7 +1741,7 @@ DEPENDENCIES
gitlab-fog-azure-rm (~> 1.7.0)
gitlab-labkit (~> 0.31.1)
gitlab-license (~> 2.2.1)
- gitlab-mail_room (~> 0.0.9)
+ gitlab-mail_room (~> 0.0.23)
gitlab-markup (~> 1.9.0)
gitlab-net-dns (~> 0.9.1)
gitlab-sidekiq-fetcher!
--
GitLab