Commit 22a117e6 authored by charlie ablett's avatar charlie ablett

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

Update mailroom to v0.0.9

See merge request gitlab-org/gitlab!56592
parents 7663e254 a36e2684
...@@ -439,7 +439,7 @@ end ...@@ -439,7 +439,7 @@ end
gem 'octokit', '~> 4.15' gem 'octokit', '~> 4.15'
# https://gitlab.com/gitlab-org/gitlab/issues/207207 # https://gitlab.com/gitlab-org/gitlab/issues/207207
gem 'gitlab-mail_room', '~> 0.0.8', require: 'mail_room' gem 'gitlab-mail_room', '~> 0.0.9', require: 'mail_room'
gem 'email_reply_trimmer', '~> 0.1' gem 'email_reply_trimmer', '~> 0.1'
gem 'html2text' gem 'html2text'
......
...@@ -464,7 +464,7 @@ GEM ...@@ -464,7 +464,7 @@ GEM
pg_query (~> 1.3) pg_query (~> 1.3)
redis (> 3.0.0, < 5.0.0) redis (> 3.0.0, < 5.0.0)
gitlab-license (1.3.1) gitlab-license (1.3.1)
gitlab-mail_room (0.0.8) gitlab-mail_room (0.0.9)
gitlab-markup (1.7.1) gitlab-markup (1.7.1)
gitlab-net-dns (0.9.1) gitlab-net-dns (0.9.1)
gitlab-pry-byebug (3.9.0) gitlab-pry-byebug (3.9.0)
...@@ -1427,7 +1427,7 @@ DEPENDENCIES ...@@ -1427,7 +1427,7 @@ DEPENDENCIES
gitlab-fog-google (~> 1.13) gitlab-fog-google (~> 1.13)
gitlab-labkit (~> 0.16.1) gitlab-labkit (~> 0.16.1)
gitlab-license (~> 1.3) gitlab-license (~> 1.3)
gitlab-mail_room (~> 0.0.8) gitlab-mail_room (~> 0.0.9)
gitlab-markup (~> 1.7.1) gitlab-markup (~> 1.7.1)
gitlab-net-dns (~> 0.9.1) gitlab-net-dns (~> 0.9.1)
gitlab-pry-byebug gitlab-pry-byebug
......
---
title: Update mailroom to v0.0.9
merge_request: 56592
author:
type: changed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment