Conflicts:
- `app/helpers/settings_helper.rb`:
Upstream added a new helper.
Conflict caused by the fact there is a glitch-soc specific helper.
Added upstream's new helper in addition to glitch-soc's.
Conflicts:
- `app/helpers/theme_helper.rb`:
Upstream added fallback behavior for when the admin-set theme does not exist.
Glitch-soc has a different theming system, but already had similar fallback,
so not changing glitch-soc code.
- `spec/helpers/theme_helper_spec.rb`:
Upstream adapted existing tests for the new fallback behavior, and added some
tests accordingly.
Glitch-soc has a different theming system, adapted the new tests accordingly.
Conflicts are too numerous to list, but they are all caused by upstream's
theming changes and all have to do with the differences between upstream and
glitch-soc in the theming systems.
They were all manually resolved by adapting the relevant code.
Conflicts:
- `app/helpers/theme_helper.rb`:
Upstream simplified `theme_style_tags`. Our version is different because of
the different theming system.
Adapted upstream's changes.
- `app/views/layouts/error.html.haml`:
Theming system.
Conflicts:
- `app/helpers/theme_helper.rb`:
Upstream modified `theme_color_tags` to work on color scheme rather than theme.
Updated it as well.
- `app/views/layouts/embedded.html.haml`:
Upstream changed the embed theme from `mastodon-light` to `system`.
Glitch-soc doesn't use a hardcoded value, so ignore the change.
- `spec/helpers/theme_helper_spec.rb`:
Accomodate `theme_color_tags` changes.
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.
- `app/helpers/application_helper.rb`:
Upstream updated the classes used for theming purposes,
but glitch-soc has its own theming system.
Adapted upstream's changes.
- `spec/helpers/application_helper_spec.rb`:
Upstream updated the classes used for theming purposes,
but glitch-soc has its own theming system.
Adapted upstream's changes.
Conflicts:
- `config/settings.yml`:
Not a real conflict, upstream removed settings that are identical in glitch-soc
but textually adjacent to glitch-soc-only settings.
Removed what upstream removed.
Conflicts:
- `app/serializers/activitypub/note_serializer.rb`:
Conflict because upstream added context extensions where glitch-soc had its own.
Added upstream's new context extension while keeping ours.
Conflicts:
- `app/helpers/theme_helper.rb`:
Conflict because of different theming system.
Adapted upstream's changes.
- `vite.config.mts`:
Conflict because of different theming system.
Adapted upstream's changes.
Conflicts:
- `spec/helpers/theme_helper_spec.rb`:
Conflict due to glitch-soc's different theming system.
Adapted upstream changes to glitch-soc's theming system.
