summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-08-19 10:18:20 -0700
committerDouwe Maan <douwe@gitlab.com>2015-08-19 10:18:20 -0700
commit170aa3b43b5186f73b149eae6b80b96a9b1171b2 (patch)
tree2e64478673e836fed997864fbe7e4ea24752f39a
parentee1eb2948d30365be241bed6a68b29da57495af8 (diff)
downloadgitlab-ce-170aa3b43b5186f73b149eae6b80b96a9b1171b2.tar.gz
Update mail_room.
-rw-r--r--Gemfile.lock2
-rw-r--r--Procfile2
2 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 629d128b424..c4c327aa758 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
GIT
remote: git://github.com/DouweM/mail_room.git
- revision: b9deb6430ca13b2d44676827c45476d76966922c
+ revision: c17c74cdef55dcd962333545fdb4d6e496cd9050
branch: sidekiq
specs:
mail_room (0.3.1)
diff --git a/Procfile b/Procfile
index 51154f150d1..0b58566e2fe 100644
--- a/Procfile
+++ b/Procfile
@@ -1,3 +1,3 @@
web: bundle exec unicorn_rails -p ${PORT:="3000"} -E ${RAILS_ENV:="development"} -c ${UNICORN_CONFIG:="config/unicorn.rb"}
worker: bundle exec sidekiq -q post_receive -q mailer -q archive_repo -q system_hook -q project_web_hook -q gitlab_shell -q incoming_email -q common -q default
-mail_room: bundle exec mail_room -c config/mail_room.yml
+mail_room: bundle exec mail_room -q -c config/mail_room.yml