diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-09-03 14:33:06 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-09-03 14:33:06 +0200 |
commit | 6c233a04a04f674b1be75ce7c6c4547c7a006797 (patch) | |
tree | 24b32d52e098fac57e91fd26be1311b7b677c9c9 /config/sidekiq.yml | |
parent | e915bc3e9e32e34bf80d1bd66ee3f80d2ca37969 (diff) | |
parent | ccc2f608c5c1caac2ea4796f4490f29d59d67068 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: README.md Discarded upstream changes to the README, kept our version.
Diffstat (limited to 'config/sidekiq.yml')
-rw-r--r-- | config/sidekiq.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/sidekiq.yml b/config/sidekiq.yml index 244e9ea48..59dfeaf97 100644 --- a/config/sidekiq.yml +++ b/config/sidekiq.yml @@ -3,8 +3,8 @@ :queues: - default - push - - pull - mailers + - pull :schedule: subscriptions_scheduler: cron: '<%= Random.rand(0..59) %> <%= Random.rand(4..6) %> * * *' |