Merge branch 'sh-update-mailroom' into 'master'

Update mailroom to v0.0.10

See merge request gitlab-org/gitlab!56913

Gemfile

@@ -440,7 +440,11 @@ end
 gem 'octokit', '~> 4.15'
 
 # https://gitlab.com/gitlab-org/gitlab/issues/207207
-gem 'gitlab-mail_room', '~> 0.0.9', require: 'mail_room'
+gem 'gitlab-mail_room', '~> 0.0.10', require: false
+# Ruby v3.0 promoted net-http and net-imap from stdlib. Adding net-http as a
+# dependency avoids "already initialized constant errors" if net-imap is installed.
+gem 'net-http', '~> 0.1'
+gem 'uri', '= 0.10.0' # Lock this for bundler v2.1.4
 
 gem 'email_reply_trimmer', '~> 0.1'
 gem 'html2text'

Gemfile.lock

@@ -268,6 +268,7 @@ GEM
     diff-lcs (1.4.4)
     diff_match_patch (0.1.0)
     diffy (3.3.0)
+    digest (3.0.0)
     discordrb-webhooks (3.4.2)
       rest-client (>= 2.0.0)
     docile (1.3.2)
@@ -464,7 +465,8 @@ GEM
       pg_query (~> 1.3)
       redis (> 3.0.0, < 5.0.0)
     gitlab-license (1.3.1)
-    gitlab-mail_room (0.0.9)
+    gitlab-mail_room (0.0.10)
+      net-imap (>= 0.2.1)
     gitlab-markup (1.7.1)
     gitlab-net-dns (0.9.1)
     gitlab-pry-byebug (3.9.0)
@@ -763,10 +765,18 @@ GEM
       mustermann (>= 1.0.0)
     nap (1.1.0)
     nenv (0.3.0)
+    net-http (0.1.1)
+      net-protocol
+      uri
     net-http-persistent (4.0.1)
       connection_pool (~> 2.2)
+    net-imap (0.2.1)
+      digest
+      net-protocol
+      strscan
     net-ldap (0.16.3)
     net-ntp (2.1.3)
+    net-protocol (0.1.0)
     net-scp (3.0.0)
       net-ssh (>= 2.6.5, < 7.0.0)
     net-ssh (6.0.0)
@@ -1208,6 +1218,7 @@ GEM
     state_machines-activerecord (0.8.0)
       activerecord (>= 5.1)
       state_machines-activemodel (>= 0.8.0)
+    strscan (3.0.0)
     swd (1.1.2)
       activesupport (>= 3)
       attr_required (>= 0.0.5)
@@ -1278,6 +1289,7 @@ GEM
       equalizer (~> 0.0.9)
       parser (>= 2.6.5)
       procto (~> 0.0.2)
+    uri (0.10.0)
     uri_template (0.7.0)
     valid_email (0.1.3)
       activemodel
@@ -1427,7 +1439,7 @@ DEPENDENCIES
   gitlab-fog-google (~> 1.13)
   gitlab-labkit (~> 0.16.2)
   gitlab-license (~> 1.3)
-  gitlab-mail_room (~> 0.0.9)
+  gitlab-mail_room (~> 0.0.10)
   gitlab-markup (~> 1.7.1)
   gitlab-net-dns (~> 0.9.1)
   gitlab-pry-byebug
@@ -1489,6 +1501,7 @@ DEPENDENCIES
   mini_magick (~> 4.10.1)
   minitest (~> 5.11.0)
   multi_json (~> 1.14.1)
+  net-http (~> 0.1)
   net-ldap (~> 0.16.3)
   net-ntp
   net-ssh (~> 6.0)
@@ -1597,6 +1610,7 @@ DEPENDENCIES
   unicorn (~> 5.5)
   unicorn-worker-killer (~> 0.4.4)
   unleash (~> 0.1.5)
+  uri (= 0.10.0)
   valid_email (~> 0.1)
   validates_hostname (~> 1.0.11)
   version_sorter (~> 2.2.4)

changelogs/unreleased/sh-update-mailroom.yml

+---
+title: Update mailroom to v0.0.10
+merge_request: 56913
+author:
+type: fixed

config/dependency_decisions.yml

@@ -331,3 +331,9 @@
     :why: https://github.com/xijo/reverse_markdown/blob/master/LICENSE
     :versions: []
     :when: 2021-02-03 08:47:28.792907000 Z
+- - :approve
+  - net-protocol
+  - :who: Stan Hu
+    :why: "This license is the same as the Ruby license (BSD): https://github.com/ruby/net-protocol/blob/master/LICENSE.txt"
+    :versions: []
+    :when: 2021-03-18 00:00:46.124036000 Z