summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2015-09-24 18:09:31 +0000
committerRobert Speicher <robert@gitlab.com>2015-09-24 18:09:31 +0000
commit1fef314df26a05bb204263129b12925ccfca0a90 (patch)
tree1e02b12cc0ab5e138802b83e22b794622a03d466 /Gemfile
parente6655fe417be29c5fb895750512e0f3e449dd8b8 (diff)
parentf6be2e0d6c666e12f0025e476db9e8387ff8ed79 (diff)
downloadgitlab-ce-1fef314df26a05bb204263129b12925ccfca0a90.tar.gz
Merge branch 'update-mailroom' into 'master'
Update mailroom to 0.5.2 Fixes #2698 and #2711. See merge request !1424
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 15b6bdab9d7..ad9fef38da1 100644
--- a/Gemfile
+++ b/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'