Conflicts:
- `app/services/post_status_service.rb`:
Upstream added a line adjacent to one that had been modified due to local-only posting.
Added upstream's change.
- `tsconfig.json`:
Upstream updated Typescript and updated `tsconfig` in the process by changing paths, where
glitch-soc had extra paths. Updated as upstream did.
Conflicts:
- `.prettierignore`:
Upstream removed it, replaced by `.oxfmtrc.json`.
We had glitch-specific files in there.
Updated `.oxfmtrc.json` accordingly and removed `.prettierignore`.
- `config/formatjs-formatter.js`:
Upstream switched to `oxfmt` from `prettier`, and some rules are slightly different.
Glitch-soc had extra code in there.
Reformatted appropriately.
- `eslint.config.mjs`:
Upstream moved some configuration from `eslint.config.mjs` to `.oxfmtrc.json` where
glitch-soc had slightly different configuration.
Removed it from `eslint.config.mjs` as well and updated `.oxfmtrc.json` accordingly.
- `package.json`:
Upstream changed script definitions textually adjacent to one that we have modified.
Applied upstream's change, keeping the textually adjacent modified script intact.
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/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/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:
- `package.json`:
Upstream added/updated dependency adjacent to glitch-soc-only dependency.
Updated as upstream did.
- `vite.config.mts`:
Upstream reworked the config file while using a different plugin for themes.
Adapted upstream's changes.
- `yarn.lock`:
Same as `package.json`
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:
- `vite.config.mts`:
Upstream moved its theming system to a plug-in, where we had our own.
Adapted the file as well as our own plugin to adopt the same mechanisms.
Conflicts:
- `app/views/layouts/embedded.html.haml`:
Upstream made a change to javascript tags next to lines changed in glitch-soc
because of the theming system.
Added the javascript entrypoint upstream added.
- `app/views/layouts/error.html.haml`:
Upstream made a change to javascript tags next to lines changed in glitch-soc
because of the theming system.
Added the javascript entrypoint upstream added.
