Conflicts:
- `app/lib/content_security_policy.rb`:
Upstream added support for `EXTRA_MEDIA_HOSTS` which is very similar to
glitch-soc's `EXTRA_DATA_HOST`.
Deprecate `EXTRA_DATA_HOST` FOR `EXTRA_MEDIA_HOST`.
Conflicts:
- `app/services/precompute_feed_service.rb`:
Upstream added an option to skip half-generated timelines.
We have a conflict because we still maintain upstream's old chronological DM
timelines.
Update our code to apply the same logic to the DM timelines.
Conflicts:
- `app/lib/feed_manager.rb`:
Not a real conflict, but glitch-soc has an extra `populate_direct_feed` method.
Added upstream's code.
- `app/models/user_settings.rb`:
Not a real conflict, glitch-soc has an extra setting textually-adjacent to a
setting added upstream.
Added upstream's setting.
- `app/serializers/initial_state_serializer.rb`:
Same.
- `app/services/precompute_feed_service.rb`:
Not a real conflict, glitch-soc has extra code for the direct feed.
Added upstream's new code for populating lists.
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
Conflict because one of the removed lines was modified to accomodate for
glitch-soc's slightly different build system.
Removed the lines as upstream did.
Conflicts:
- `app/models/concerns/user/has_settings.rb`:
Not a real conflict, upstream added a setting textually close to a glitch-soc one.
Added upstream's new setting.
- `app/views/settings/preferences/appearance/show.html.haml`:
Not a real conflict, upstream added a setting textually close to a glitch-soc one.
Added upstream's new setting.
- `config/routes.rb`:
Upstream moved web app routes to `config/routes/web_app.rb`, while glitch-soc had
an extra route.
Moved the extra route to `config/routes/web_app.rb`.
- `spec/controllers/settings/preferences/appearance_controller_spec.rb`:
This spec got converted to a system spec upstream.
However, the theme setting works differently in glitch-soc, so the spec had been
changed.
Changed the corresponding system spec as well.
Conflicts:
- `app/lib/feed_manager.rb`:
Upstream changed how notifications from follow subscriptions were handled,
refactoring this file in the process.
Conflict is due to glitch-soc having an extra timeline type (direct).
Ported upstream's changes.
- `app/workers/feed_insert_worker.rb`:
Ditto.
Claire
Nicholas La Roux
Jonathan de Jong