Merge pull request #2305 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/views/admin/settings/appearance/show.html.haml`:
Upstream enforced an uniform code style around lambdas, and glitch-soc
had a different lambda due to its theming system.
Applied the same code style changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream enforced an uniform code style around lambdas, and glitch-soc
removed some code just after the lambda.
Applied the same code style changes.
Fix “Back” button sometimes redirecting out of Mastodon (#25281)
Merge pull request #2300 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Merge pull request #2296 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Change “About” and “Privacy policy” links to open in a new tab in advanced interface (#25973)
Change links in multi-column mode so tabs are open in single-column mode (#25893)
Fix embed dropdown menu item for unauthenticated users (#25964)
Merge commit '73b64b89170cb72854a1709186c62ce31f476889' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/styles/fonts/roboto-mono.scss`:
Upstream updated the linter, which changed a few linter rules.
Some of those changed lines are different in glitch-soc because we use
different paths for the assets.
Applied the same style rules on our version of the file.
- `app/javascript/styles/fonts/roboto.scss`:
Upstream updated the linter, which changed a few linter rules.
Some of those changed lines are different in glitch-soc because we use
different paths for the assets.
Applied the same style rules on our version of the file.
Upgrade to `typescript-eslint` v6 (#25904)
Convert Home timeline components to Typescript (#25583)
Upgrade to Prettier 3 (#25902)
Merge pull request #2291 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
Upstream renamed an initial state parameter, where we had extra ones.
Renamed as upstream did.
- `app/workers/feed_insert_worker.rb`:
Upstream wrapped database query in a block, we had extra database
queries because of the DM timeline.
Moved everything in the block.