Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock10
2 files changed, 3 insertions, 9 deletions
diff --git a/Gemfile b/Gemfile
index 9879141f5cb..3aa3c72e088 100644
--- a/Gemfile
+++ b/Gemfile
@@ -273,6 +273,6 @@ gem "newrelic_rpm"
gem 'octokit', '3.7.0'
-gem "mail_room", github: "DouweM/mail_room", branch: "sidekiq"
+gem "mail_room", "~> 0.4.0"
gem 'email_reply_parser'
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