diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-09-24 21:09:31 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-09-24 21:30:50 +0300 |
| commit | 432dc45e3ac2015abd74b0e81ca539ea72c5cae7 (patch) | |
| tree | 8449edc11d3f42fff2f1464af39e48ee412f2214 | |
| parent | fa51db07009cb591b9a9639937e01a7886fda7ab (diff) | |
Merge branch 'update-mailroom' into 'master'
Update mailroom to 0.5.2
Fixes #2698 and #2711.
See merge request !1424
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | config/mail_room.yml.example | 2 | ||||
| -rw-r--r-- | doc/incoming_email/README.md | 4 |
5 files changed, 11 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index 83615d18727..f6768cd967b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -10,6 +10,8 @@ v 8.0.2 (unreleased) - Fix LDAP attribute mapping - Remove git refs used internally by GitLab from network graph (Stan Hu) - 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 - Improve CI migration procedure and documentation @@ -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' diff --git a/Gemfile.lock b/Gemfile.lock index 23f5a407229..3c16251497d 100644 --- a/Gemfile.lock +++ b/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.15.1) 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) diff --git a/config/mail_room.yml.example b/config/mail_room.yml.example index dd8edfc42eb..82e1a42058e 100644 --- a/config/mail_room.yml.example +++ b/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 diff --git a/doc/incoming_email/README.md b/doc/incoming_email/README.md index c94e25bd4cc..01ab22321ed 100644 --- a/doc/incoming_email/README.md +++ b/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 |