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/helpers/theme_helper.rb`:
Upstream removed the feature flag and refactored, while we have a slightly
different theming system.
Updated accordingly.
- `stylelint.config.js`:
Upstream removed overrides for the temporary themes.
Did the same.
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:
- `.github/dependabot.yml`:
Updated upstream, removed in glitch-soc to disable noise.
Kept removed.
- `CODE_OF_CONDUCT.md`:
Upstream updated to a new version of the covenant, but I have not read it
yet, so kept unchanged.
- `Gemfile.lock`:
Not a real conflict, one upstream dependency updated textually too close to
the glitch-soc only `hcaptcha` dependency.
Applied upstream changes.
- `app/controllers/admin/base_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/controllers/application_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/controllers/disputes/base_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/controllers/relationships_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/controllers/statuses_cleanup_controller.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/helpers/application_helper.rb`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
Upstream added a highlight animation for onboarding, while we changed the
max character limit.
Applied our local changes on top of upstream's new version.
- `app/views/layouts/application.html.haml`:
Minor conflict due to glitch-soc's theming system.
Applied upstream changes.
- `stylelint.config.js`:
Upstream added ignore paths, glitch-soc had extra ignore paths.
Added the same paths as upstream.
Conflicts:
- `package.json`:
Upstream removed a dependency that was textually close to a glitch-soc-only
dependency.
Removed the dependency as upstream did, while keeping the glitch-soc-only
dependency.
