Thibaut Girka 980c004f06 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: No real conflict, glitch-soc-only dependency (redcarpet) too close to an upstream one (rdf-normalize) - `README.md`: we have different READMEs, discarded upstream's changes - `app/views/admin/custom_emojis/index.html.haml`: No real conflict, different context because of glitch-soc theming - `lib/mastodon/statuses_cli.rb`: Upstream added code to keep bookmarked statuses, we were already doing so with slightly different code. Discarded upstream's changes. - `package.json`: No real conflict, glitch-soc-only dependency (favico.js) too close to an upstream one		2020-01-12 15:57:34 +01:00
..
delivery_worker.rb	Suppress backtrace when delivering toots (#12798)	2020-01-11 02:15:03 +01:00
distribute_poll_update_worker.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-07 17:00:36 +02:00
distribution_worker.rb	Refactor all ActivityPub deliveries to be serialized and signed through one concern (#10966)	2019-06-04 23:11:18 +02:00
fetch_replies_worker.rb	Do not error out on unsalvageable errors in FetchRepliesService (#10175)	2019-03-05 15:21:14 +01:00
low_priority_delivery_worker.rb	Move sending account Delete to anyone but the account's followers to the pull̀ queue (#10016)	2019-02-12 05:10:43 +01:00
move_distribution_worker.rb	Fixed missing account in MoveDistributionWorker (#11906)	2019-09-21 09:11:58 +02:00
post_upgrade_worker.rb
processing_worker.rb	Do not retry processing ActivityPub jobs raising validation errors (#10614)	2019-05-03 23:45:37 +02:00
raw_distribution_worker.rb
reply_distribution_worker.rb	Refactor all ActivityPub deliveries to be serialized and signed through one concern (#10966)	2019-06-04 23:11:18 +02:00
synchronize_featured_collection_worker.rb
update_distribution_worker.rb	Refactor all ActivityPub deliveries to be serialized and signed through one concern (#10966)	2019-06-04 23:11:18 +02:00