Thibaut Girka 4a70792b4a Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Not a real conflict, just a glitch-soc-only dependency too close to a dependency that got updated upstream. Updated as well. - `app/models/status.rb`: Not a real conflict, just a change too close to glitch-soc-changed code for optionally showing boosts in public timelines. Applied upstream changes. - `app/views/layouts/application.html.haml`: Upstream a new, static CSS file, conflict due to glitch-soc's theming system, include the file regardless of the theme. - `config/initializers/content_security_policy.rb`: Upstream dropped 'unsafe-inline' from the 'style-src' directive, but both files are very different. Removed 'unsafe-inline' as well.		2020-05-10 16:19:56 +02:00
..
delivery_worker.rb	Fix error within error when limiting backtrace to 3 lines (#13120)	2020-05-10 10:30:27 +02:00
distribute_poll_update_worker.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-04-02 20:32:00 +02:00
distribution_worker.rb
fetch_replies_worker.rb
low_priority_delivery_worker.rb
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
raw_distribution_worker.rb
reply_distribution_worker.rb
synchronize_featured_collection_worker.rb	Fix background jobs not using locks like they are supposed to (#13361)	2020-03-31 21:59:03 +02:00
update_distribution_worker.rb