4a70792b4a
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. |
||
|---|---|---|
| .. | ||
| delivery_worker.rb | ||
| distribute_poll_update_worker.rb | ||
| distribution_worker.rb | ||
| fetch_replies_worker.rb | ||
| low_priority_delivery_worker.rb | ||
| move_distribution_worker.rb | ||
| post_upgrade_worker.rb | ||
| processing_worker.rb | ||
| raw_distribution_worker.rb | ||
| reply_distribution_worker.rb | ||
| synchronize_featured_collection_worker.rb | ||
| update_distribution_worker.rb | ||