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/validators/poll_options_validator.rb`:
Upstream split `PollValidator` in two, and glitch-soc had local changes to
make the options configurable.
Refactored as upstream did, keeping glitch-soc's configurable limits.
Conflicts:
- `spec/system/settings/preferences/appearance_spec.rb`:
Upstream tests for changing themes in there, but glitch-soc has
its own place for that.
Updated upstream's change while skipping the theme test.
Conflicts:
- `CONTRIBUTING.md`:
Upstream changed the file, while we had a different one.
Updated the common parts.
- `README.md`:
Upstream changed the file, while we had a different one.
Updated the common parts.
- `app/helpers/application_helper.rb`:
Upstream added helpers where glitch-soc had extra ones.
Added upstream's new helpers.
- `app/models/form/admin_settings.rb`:
Upstream added some custom handling of one setting, while
glitch-soc had additional code.
Ported upstream's code.
- `lib/mastodon/version.rb`:
Upstream moved some things to `config/mastodon.yml`.
Did the same.
- `spec/requests/api/v1/accounts/credentials_spec.rb`:
I don't know honestly.
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.
Claire
Matt Jankowski
Eugen Rochko