summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-09-24 15:11:41 +0200
committerDouwe Maan <douwe@gitlab.com>2015-09-24 15:11:41 +0200
commit29e0a43efe7c06d4c7ae52600beef79993744191 (patch)
treec82f4efb783df4bf21a44130f01c23bb8becc989
parent6a32608989a410ca60c3c1ed0fddeb6c0aaffcce (diff)
downloadgitlab-ce-29e0a43efe7c06d4c7ae52600beef79993744191.tar.gz
Update mail_room
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index b29846f738a..ac272dd2160 100644
--- a/Gemfile
+++ b/Gemfile
@@ -286,7 +286,7 @@ gem "newrelic_rpm", '~> 3.9.4.245'
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 6070beb9d07..5bc1c998f38 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)
@@ -848,7 +848,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)