From e35b731e7d43b1706db28a75558f9526235362bd Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Fri, 11 Dec 2020 08:28:27 -0800
Subject: [PATCH] Upgrade mailroom to v0.0.8
This may help with the process not terminating properly:
https://gitlab.com/gitlab-org/charts/gitlab/-/issues/2440
---
Gemfile | 2 +-
Gemfile.lock | 4 ++--
changelogs/unreleased/sh-upgrade-mailroom-0-0-8.yml | 5 +++++
3 files changed, 8 insertions(+), 3 deletions(-)
create mode 100644 changelogs/unreleased/sh-upgrade-mailroom-0-0-8.yml
diff --git a/Gemfile b/Gemfile
index 282c503d3c8ad..c75cd8dfb19ba 100644
--- a/Gemfile
+++ b/Gemfile
@@ -430,7 +430,7 @@ end
gem 'octokit', '~> 4.15'
# https://gitlab.com/gitlab-org/gitlab/issues/207207
-gem 'gitlab-mail_room', '~> 0.0.7', require: 'mail_room'
+gem 'gitlab-mail_room', '~> 0.0.8', require: 'mail_room'
gem 'email_reply_trimmer', '~> 0.1'
gem 'html2text'
diff --git a/Gemfile.lock b/Gemfile.lock
index 22ebab2492c44..dea06439221e4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -443,7 +443,7 @@ GEM
opentracing (~> 0.4)
redis (> 3.0.0, < 5.0.0)
gitlab-license (1.0.0)
- gitlab-mail_room (0.0.7)
+ gitlab-mail_room (0.0.8)
gitlab-markup (1.7.1)
gitlab-net-dns (0.9.1)
gitlab-pg_query (1.3.0)
@@ -1356,7 +1356,7 @@ DEPENDENCIES
gitlab-fog-azure-rm (~> 1.0)
gitlab-labkit (= 0.13.3)
gitlab-license (~> 1.0)
- gitlab-mail_room (~> 0.0.7)
+ gitlab-mail_room (~> 0.0.8)
gitlab-markup (~> 1.7.1)
gitlab-net-dns (~> 0.9.1)
gitlab-pg_query (~> 1.3)
diff --git a/changelogs/unreleased/sh-upgrade-mailroom-0-0-8.yml b/changelogs/unreleased/sh-upgrade-mailroom-0-0-8.yml
new file mode 100644
index 0000000000000..7fc59cce7a197
--- /dev/null
+++ b/changelogs/unreleased/sh-upgrade-mailroom-0-0-8.yml
@@ -0,0 +1,5 @@
+---
+title: Upgrade mailroom to v0.0.8
+merge_request: 49834
+author:
+type: fixed
--
GitLab