mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-25 09:34:16 -05: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. |
||
|---|---|---|
| .. | ||
| about | ||
| account | ||
| account_gallery | ||
| account_timeline | ||
| audio | ||
| blocks | ||
| bookmarked_statuses | ||
| closed_registrations_modal | ||
| community_timeline | ||
| compose | ||
| direct_timeline | ||
| directory | ||
| domain_blocks | ||
| emoji | ||
| explore | ||
| favourited_statuses | ||
| favourites | ||
| filters | ||
| follow_requests | ||
| followed_tags | ||
| followers | ||
| following | ||
| getting_started | ||
| hashtag_timeline | ||
| home_timeline | ||
| interaction_modal | ||
| keyboard_shortcuts | ||
| list_adder | ||
| list_editor | ||
| list_timeline | ||
| lists | ||
| mutes | ||
| notifications | ||
| onboarding | ||
| picture_in_picture | ||
| pinned_statuses | ||
| privacy_policy | ||
| public_timeline | ||
| reblogs | ||
| report | ||
| standalone/compose | ||
| status | ||
| subscribed_languages_modal | ||
| ui | ||
| video | ||