mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-21 04:39:23 +00:00
d77fbbed73
Conflicts: - `.github/dependabot.yml`: Upstream made changes, but we had removed it. Discarded upstream changes. - `.rubocop_todo.yml`: Upstream regenerated the file, we had some glitch-soc-specific ignores. - `app/models/account_statuses_filter.rb`: Minor upstream code style change where glitch-soc had slightly different code due to handling of local-only posts. Updated to match upstream's code style. - `app/models/status.rb`: Upstream moved ActiveRecord callback definitions, glitch-soc had an extra one. Moved the definitions as upstream did. - `app/services/backup_service.rb`: Upstream rewrote a lot of the backup service, glitch-soc had changes because of exporting local-only posts. Took upstream changes and added back code to deal with local-only posts. - `config/routes.rb`: Upstream split the file into different files, while glitch-soc had a few extra routes. Extra routes added to `config/routes/settings.rb`, `config/routes/api.rb` and `config/routes/admin.rb` - `db/schema.rb`: Upstream has new migrations, while glitch-soc had an extra migration. Updated the expected serial number to match upstream's. - `lib/mastodon/version.rb`: Upstream added support to set version tags from environment variables, while glitch-soc has an extra `+glitch` tag. Changed the code to support upstream's feature but prepending a `+glitch`. - `spec/lib/activitypub/activity/create_spec.rb`: Minor code style change upstream, while glitch-soc has extra tests due to `directMessage` handling. Applied upstream's changes while keeping glitch-soc's extra tests. - `spec/models/concerns/account_interactions_spec.rb`: Minor code style change upstream, while glitch-soc has extra tests. Applied upstream's changes while keeping glitch-soc's extra tests. |
||
|---|---|---|
| .. | ||
| activitypub | ||
| admin | ||
| concerns | ||
| import | ||
| scheduler | ||
| web | ||
| webhooks | ||
| account_deletion_worker.rb | ||
| account_merging_worker.rb | ||
| after_account_domain_block_worker.rb | ||
| after_unallow_domain_worker.rb | ||
| authorize_follow_worker.rb | ||
| backup_worker.rb | ||
| block_worker.rb | ||
| bootstrap_timeline_worker.rb | ||
| bulk_import_worker.rb | ||
| cache_buster_worker.rb | ||
| delete_mute_worker.rb | ||
| distribution_worker.rb | ||
| domain_block_worker.rb | ||
| domain_clear_media_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_encrypted_message_worker.rb | ||
| push_update_worker.rb | ||
| redownload_avatar_worker.rb | ||
| redownload_header_worker.rb | ||
| redownload_media_worker.rb | ||
| refollow_worker.rb | ||
| regeneration_worker.rb | ||
| remote_account_refresh_worker.rb | ||
| removal_worker.rb | ||
| remove_featured_tag_worker.rb | ||
| resolve_account_worker.rb | ||
| thread_resolve_worker.rb | ||
| trigger_webhook_worker.rb | ||
| unfavourite_worker.rb | ||
| unfollow_follow_worker.rb | ||
| unmerge_worker.rb | ||
| unpublish_announcement_worker.rb | ||
| verify_account_links_worker.rb | ||