Commit graph

15 commits

Author SHA1 Message Date
GitLab Bot
d10a462fed Add latest changes from gitlab-org/gitlab@master 2019-12-16 12:07:43 +00:00
Paul Charlton
cb3b4a15e6 Support multiple Redis instances based on queue type 2017-07-11 03:35:47 +00:00
Gabriel Mazetto
e49d55e961 Use newer mail_room to get require_relative support 2017-02-20 17:38:21 +01:00
Marin Jankovski
aa9a289ce5 Make mail_room idle_timeout option configurable. 2016-11-16 12:46:37 +01:00
Gabriel Mazetto
f9126fbe0a Updated mail_room and added sentinel support to Reply by Email 2016-10-26 05:02:47 +02:00
Stan Hu
59ed1d3cbb Fix reply-by-email not working due to queue name mismatch
mail_room was configured to deliver mail to the `incoming_email`
queue while `EmailReceiveWorker` was reading the `email_receiver`
queue. Adds a migration that repeats the work of a previous
migration to ensure all mails that wound up in the old
queue get processed.

Closes #23689
2016-10-23 21:35:52 -07:00
Gabriel Mazetto
32bb421195 Synced mail_room.yml with the one in omnibus
Added a comment to remember developers to open merge request to omnibus
in future changes of the file.
2016-08-04 18:55:37 +02:00
Gabriel Mazetto
6f31879508 Fixed specs for Gitlab::Redis and code for Redis Sentinel support 2016-08-04 18:55:37 +02:00
Gabriel Mazetto
926cee002d Deduplicated resque.yml loading from several places
We will trust redis configuration params loading to Gitlab::RedisConfig.
2016-08-04 18:55:37 +02:00
Rémy Coutable
72647eda31
Don't require Gitlab::Redis in mail_room.yml if it's already defined
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-10 13:44:45 +02:00
Jacob Vosmaer
0163e27631 Add Gitlab::Redis connection pool 2016-04-04 17:00:09 +02:00
Rémy Coutable
9f218fc184 Improve and finish the fallback to the In-Reply-To and References header for the reply-by-email feature
A few things to note:
- The IncomingEmail feature is now enabled even without a
  correctly-formatted sub-address
- Message-ID for new thread mail are kept the same so that subsequent
  notifications to this thread are grouped in the thread by the email
  service that receives the notification
  (i.e. In-Reply-To of the answer == Message-ID of the first thread message)
- To maximize our chance to be able to retrieve the reply key, we look
  for it in the In-Reply-To header and the References header
- The pattern for the fallback reply message id is "reply-[key]@[gitlab_host]"
- Improve docs thanks to Axil
2016-03-25 13:05:15 +01:00
Jacob Vosmaer
c46e6eff10 Parse config/resque.yml in one place only 2016-03-09 15:16:46 +01:00
Douwe Maan
bbdb9ba036 Don't load all of GitLab in mail_room
Fixes #12731
2016-02-26 18:48:13 -08:00
Douwe Maan
712d17684b Make Reply by email easier to configure 2015-10-13 13:10:49 +02:00