Conflicts:
- `app/views/admin/custom_emojis/new.html.haml`:
Upstream refactored a line adjacent to a glitch-soc modified line.
Ported upstream changes.
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/controllers/application_controller.rb`:
Upstream added an experimental color and contrast theme control.
Conflicts because of glitch-soc's different theming system.
Adapted upstream's changes.
- `app/views/layouts/application.html.haml`:
Upstream added an experimental color and contrast theme control.
Conflicts because of glitch-soc's different theming system.
Adapted upstream's changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream added an experimental color and contrast theme control.
Conflicts because of glitch-soc's different theming system.
Adapted upstream's changes.
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream changed a field that was moved to another page due to glitch-soc's theming system.
Ignored this one change.
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/helpers/theme_helper.rb`:
Upstream added an experimental feature flag to try out theme refactors.
Glitch-soc's theming system is too different, so skips the new feature flag.
- `stylelint.config.js`:
Ditto.
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/models/user_settings.rb`:
Upstream added a setting adjacent to a glitch-soc-only setting.
Added upstream's setting while keeping ours.
- `app/serializers/initial_state_serializer.rb`:
Upstream added a setting adjacent to a glitch-soc-only setting.
Added upstream's setting while keeping ours.
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream reorganized the whole page, while glitch-soc had an extra setting.
Adopted upstream's redesign and moved the extra setting where it made sense.
Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
Upstream moved some preferences to a new category, while glitch-soc had an
extra preference there.
Moved the extra preference like upstream did to the new category.
Conflicts:
- `app/models/trends/statuses.rb`:
Conflict because of glitch-soc's setting to allow CWs in trends.
Kept glitch-soc's setting but followed upstream's refactor.
- `docker-compose.yml`:
Conflict because of upstream VS glitch-soc repos.
Updated version number as upstream did, but kept glitch-soc repos.
Conflicts:
- `app/models/user_settings.rb`:
Upstream added a new user setting, directly next to a glitch-soc-only one.
The upstream setting would actually replace the glitch-soc one but it is not
fully implemented yet, so have them side by side now.
- `app/views/settings/preferences/appearance/show.html.haml`:
Ditto.
- `docker-compose.yml`:
Conflict due to different registry names. Updated the version while keeping
glitch-soc's registry.
Conflicts:
- `app/models/user_settings.rb`:
Not a real conflict, upstream added a setting on a line adjacent to a
glitch-soc-only line.
Added upstream's new setting.
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.
