summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-09-16 22:19:35 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-09-16 22:19:35 -0400
commit480e713c8f1cb240d00b1b2659ef206a164e3733 (patch)
tree8ea59769f592ff6559d5cefa8f0a8be6f1090ed2 /Gemfile.lock
parentcac969229aab74ab5dcd7682c4f1c3a74a17b9d6 (diff)
parent4b95b0ebec28fb8205e4f672d2df4e3ace7d5785 (diff)
downloadgitlab-ce-480e713c8f1cb240d00b1b2659ef206a164e3733.tar.gz
Merge branch 'update-mailroom' into 'master'
See merge request !1306
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index a4a0762bdd8..eeaddc95a8e 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.4.2)
+ mail_room (0.5.1)
method_source (0.8.2)
mime-types (1.25.1)
mimemagic (0.3.0)
@@ -846,7 +846,7 @@ DEPENDENCIES
jquery-ui-rails (~> 4.2.1)
kaminari (~> 0.15.1)
letter_opener (~> 1.1.2)
- mail_room (~> 0.4.2)
+ mail_room (~> 0.5.1)
minitest (~> 5.7.0)
mousetrap-rails (~> 1.4.6)
mysql2 (~> 0.3.16)