mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-23 07:38:06 +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. |
||
|---|---|---|
| .. | ||
| disputes | ||
| reports | ||
| settings | ||
| trends | ||
| users | ||
| webhooks | ||
| account_actions_controller.rb | ||
| account_moderation_notes_controller.rb | ||
| accounts_controller.rb | ||
| action_logs_controller.rb | ||
| announcements_controller.rb | ||
| base_controller.rb | ||
| change_emails_controller.rb | ||
| confirmations_controller.rb | ||
| custom_emojis_controller.rb | ||
| dashboard_controller.rb | ||
| domain_allows_controller.rb | ||
| domain_blocks_controller.rb | ||
| email_domain_blocks_controller.rb | ||
| export_domain_allows_controller.rb | ||
| export_domain_blocks_controller.rb | ||
| follow_recommendations_controller.rb | ||
| instances_controller.rb | ||
| invites_controller.rb | ||
| ip_blocks_controller.rb | ||
| relationships_controller.rb | ||
| relays_controller.rb | ||
| report_notes_controller.rb | ||
| reports_controller.rb | ||
| resets_controller.rb | ||
| roles_controller.rb | ||
| rules_controller.rb | ||
| settings_controller.rb | ||
| site_uploads_controller.rb | ||
| statuses_controller.rb | ||
| tags_controller.rb | ||
| warning_presets_controller.rb | ||
| webhooks_controller.rb | ||