Conflicts:
- `app/lib/activitypub/parser/status_parser.rb`:
Upstream refactored this class while glitch-soc had an additional method.
Moved the private methods as upstream did while keeping glitch-soc's extra one.
- `spec/lib/activitypub/activity/create_spec.rb`:
glitch-soc had extra tests.
Added upstream's new tests alongside the glitch-soc-specific ones.
* Add limit on inbox payload size
The 1MB limit is consistent with the limit we use when fetching remote resources
* Add limit to number of options from federated polls
* Add a limit to the number of federated profile fields
* Add limit on federated username length
* Add hard limits for federated display name and account bio
* Add hard limits for `alsoKnownAs` and `attributionDomains`
* Add hard limit on federated custom emoji shortcode
* Highlight most destructive limits and expand on their reasoning
Conflicts:
- `app/models/form/admin_settings.rb`:
Upstream added a method right next to glitch-soc-only methods.
Added upstream's method.
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream changed a line right next to a glitch-soc addition.
Changed the code as upstream did.
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream changed stuff too close to glitch-soc's theming system changes.
Applied upstream's changes.
- `streaming/index.js`:
Upstream refactored a bunch of stuff where our code was different due to
local-only posts.
Applied upstream's changes while taking care of local-only posts.
Conflicts:
- `app/helpers/formatting_helper.rb`:
Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span.
Wrapped the modified code.
Conflicts:
- `package.json`:
Upstream removed a dependency textually close to a glitch-only dependency.
Updated as upstream while keeping our dependency.
Conflicts:
- `.github/dependabot.yml`:
Upstream made changes while we have dropped this file.
Keep the file deleted.
- `.prettierignore`:
Upstream made changes at the end of the file, where we
had our extra lines.
Just moved our extra lines back at the end.
- `app/serializers/initial_state_serializer.rb`:
Upstream code style changes.
Applied them.
- `app/services/backup_service.rb`:
Upstream code style changes.
Applied them.
Tarrien
Claire
David Roetzel
Jonny Saunders
KMY（雪あすか）
Nick Schonning