summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2016-05-05 14:34:04 +0200
committerDouwe Maan <douwe@selenight.nl>2016-05-05 14:34:04 +0200
commit1c65019742af734dd6f0fd5a5e185952f859ab9e (patch)
treef7a97d7d17906ef6a4712cee406c1315cdec8331 /Gemfile
parentc583433862558550c8caedb03217880568dcdefc (diff)
parent6243a834115c9c815fe9a1224824f02f9fb3857f (diff)
downloadgitlab-ce-1c65019742af734dd6f0fd5a5e185952f859ab9e.tar.gz
Merge branch 'stanhu/gitlab-ce-bump-mailroom'
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index c3fcd8d3f24..1137ef4d72b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -320,7 +320,7 @@ gem "newrelic_rpm", '~> 3.14'
gem 'octokit', '~> 4.3.0'
-gem "mail_room", "~> 0.6.1"
+gem "mail_room", "~> 0.7"
gem 'email_reply_parser', '~> 0.5.8'