Merge branch 'update-mailroom' into 'master'

Update mailroom to 0.5.2

Fixes #2698 and #2711.

See merge request !1424

CHANGELOG

@@ -19,6 +19,8 @@ v 8.0.2 (unreleased)
   - Fix top margin for sign-in button on public pages
   - Fix LDAP attribute mapping
   - Use standard Markdown font in Markdown preview instead of fixed-width font (Stan Hu)
+  - Fix Reply by email for non-UTF-8 messages.
+  - Add option to use StartTLS with Reply by email IMAP server.
 
 v 8.0.1
   - Remove git refs used internally by GitLab from network graph (Stan Hu)

Gemfile

@@ -287,7 +287,7 @@ gem 'newrelic-grape'
 
 gem 'octokit', '~> 3.7.0'
 
-gem "mail_room", "~> 0.5.1"
+gem "mail_room", "~> 0.5.2"
 
 gem 'email_reply_parser', '~> 0.5.8'
 

Gemfile.lock

@@ -384,7 +384,7 @@ GEM
       systemu (~> 2.6.2)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
-    mail_room (0.5.1)
+    mail_room (0.5.2)
     method_source (0.8.2)
     mime-types (1.25.1)
     mimemagic (0.3.0)
@@ -851,7 +851,7 @@ DEPENDENCIES
   jquery-ui-rails (~> 4.2.1)
   kaminari (~> 0.16.3)
   letter_opener (~> 1.1.2)
-  mail_room (~> 0.5.1)
+  mail_room (~> 0.5.2)
   minitest (~> 5.7.0)
   mousetrap-rails (~> 1.4.6)
   mysql2 (~> 0.3.16)

config/mail_room.yml.example

@@ -6,6 +6,8 @@
     # :port: 993
     # # Whether the IMAP server uses SSL
     # :ssl: true
+    # # Whether the IMAP server uses StartTLS
+    # :start_tls: false
     # # Email account username. Usually the full email address.
     # :email: "replies@gitlab.example.com"
     # # Email account password

doc/incoming_email/README.md

@@ -88,6 +88,8 @@ In this example, we'll use the Gmail address `gitlab-incoming@gmail.com`.
         :port: 993
         # Whether the IMAP server uses SSL
         :ssl: true
+        # Whether the IMAP server uses StartTLS
+        :start_tls: false
         # Email account username. Usually the full email address.
         :email: "gitlab-incoming@gmail.com"
         # Email account password
@@ -161,6 +163,8 @@ In this example, we'll use the Gmail address `gitlab-incoming@gmail.com`.
         :port: 993
         # Whether the IMAP server uses SSL
         :ssl: true
+        # Whether the IMAP server uses StartTLS
+        :start_tls: false
         # Email account username. Usually the full email address.
         :email: "gitlab-incoming@gmail.com"
         # Email account password