mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-24 06:46:29 +00:00
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. |
||
|---|---|---|
| .. | ||
| activitypub | ||
| admin | ||
| concerns | ||
| import | ||
| scheduler | ||
| web | ||
| after_account_domain_block_worker.rb | ||
| authorize_follow_worker.rb | ||
| backup_worker.rb | ||
| block_worker.rb | ||
| bootstrap_timeline_worker.rb | ||
| digest_mailer_worker.rb | ||
| distribution_worker.rb | ||
| domain_block_worker.rb | ||
| feed_insert_worker.rb | ||
| fetch_reply_worker.rb | ||
| import_worker.rb | ||
| link_crawl_worker.rb | ||
| local_notification_worker.rb | ||
| merge_worker.rb | ||
| move_worker.rb | ||
| mute_worker.rb | ||
| poll_expiration_notify_worker.rb | ||
| post_process_media_worker.rb | ||
| publish_announcement_reaction_worker.rb | ||
| publish_scheduled_announcement_worker.rb | ||
| publish_scheduled_status_worker.rb | ||
| push_conversation_worker.rb | ||
| push_update_worker.rb | ||
| redownload_media_worker.rb | ||
| refollow_worker.rb | ||
| regeneration_worker.rb | ||
| removal_worker.rb | ||
| resolve_account_worker.rb | ||
| thread_resolve_worker.rb | ||
| unfavourite_worker.rb | ||
| unfollow_follow_worker.rb | ||
| unmerge_worker.rb | ||
| unpublish_announcement_worker.rb | ||
| verify_account_links_worker.rb | ||