mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-27 10:31:36 +01: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 | ||
| concerns | ||
| keys | ||
| account_search_service.rb | ||
| account_statuses_cleanup_service.rb | ||
| after_block_domain_from_account_service.rb | ||
| after_block_service.rb | ||
| after_unallow_domain_service.rb | ||
| app_sign_up_service.rb | ||
| appeal_service.rb | ||
| approve_appeal_service.rb | ||
| authorize_follow_service.rb | ||
| backup_service.rb | ||
| base_service.rb | ||
| batched_remove_status_service.rb | ||
| block_domain_service.rb | ||
| block_service.rb | ||
| bootstrap_timeline_service.rb | ||
| bulk_import_row_service.rb | ||
| bulk_import_service.rb | ||
| clear_domain_media_service.rb | ||
| create_featured_tag_service.rb | ||
| delete_account_service.rb | ||
| deliver_to_device_service.rb | ||
| fan_out_on_write_service.rb | ||
| favourite_service.rb | ||
| fetch_link_card_service.rb | ||
| fetch_oembed_service.rb | ||
| fetch_remote_status_service.rb | ||
| fetch_resource_service.rb | ||
| follow_migration_service.rb | ||
| follow_service.rb | ||
| import_service.rb | ||
| move_service.rb | ||
| mute_service.rb | ||
| notify_service.rb | ||
| post_status_service.rb | ||
| precompute_feed_service.rb | ||
| process_hashtags_service.rb | ||
| process_mentions_service.rb | ||
| purge_domain_service.rb | ||
| reblog_service.rb | ||
| reject_follow_service.rb | ||
| remove_domains_from_followers_service.rb | ||
| remove_featured_tag_service.rb | ||
| remove_from_followers_service.rb | ||
| remove_status_service.rb | ||
| report_service.rb | ||
| resolve_account_service.rb | ||
| resolve_url_service.rb | ||
| search_service.rb | ||
| suspend_account_service.rb | ||
| tag_search_service.rb | ||
| translate_status_service.rb | ||
| unallow_domain_service.rb | ||
| unblock_domain_service.rb | ||
| unblock_service.rb | ||
| unfavourite_service.rb | ||
| unfollow_service.rb | ||
| unmute_service.rb | ||
| unsuspend_account_service.rb | ||
| update_account_service.rb | ||
| update_status_service.rb | ||
| verify_link_service.rb | ||
| vote_service.rb | ||
| webhook_service.rb | ||