summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-08-20 10:58:04 -0700
committerDouwe Maan <douwe@gitlab.com>2015-08-20 10:58:04 -0700
commit3ff9d5c64cef8bf8daed5e253e388545987fb945 (patch)
tree708b427dadd4c38a5af7cd34fe59a46d76e0bb9c /Gemfile.lock
parent83081f167397c6c325a4f8c604191e766b2c3d3b (diff)
downloadgitlab-ce-3ff9d5c64cef8bf8daed5e253e388545987fb945.tar.gz
Use canonical version of mail_room.
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock10
1 files changed, 2 insertions, 8 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index c4c327aa758..5278fe243a8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,3 @@
-GIT
- remote: git://github.com/DouweM/mail_room.git
- revision: c17c74cdef55dcd962333545fdb4d6e496cd9050
- branch: sidekiq
- specs:
- mail_room (0.3.1)
-
GEM
remote: https://rubygems.org/
specs:
@@ -379,6 +372,7 @@ GEM
systemu (~> 2.6.2)
mail (2.6.3)
mime-types (>= 1.16, < 3)
+ mail_room (0.4.0)
method_source (0.8.2)
mime-types (1.25.1)
mimemagic (0.3.0)
@@ -814,7 +808,7 @@ DEPENDENCIES
jquery-ui-rails
kaminari (~> 0.15.1)
letter_opener
- mail_room!
+ mail_room (~> 0.4.0)
minitest (~> 5.3.0)
mousetrap-rails
mysql2