Merge pull request #2300 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

Merge commit '71db616fed817893d0efa363f0e7dbfcf23866a0' into glitch-soc/merge-upstream

Merge pull request #2296 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

Fix embed dropdown menu item for unauthenticated users (#25964)

Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream

Conflicts:
- app/controllers/application_controller.rb:
  Upstream added an `include` where we had an extra `include` due to
  glitch-soc's theming system.
  Added upstream's new `include`.

Merge pull request #2291 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

Change markers API to use a replica (#25851)

Change notifications API to use a replica (#25874)

Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream

Conflicts:
- `db/migrate/20180831171112_create_bookmarks.rb`:
  Upstream ran a lint fix on this file, but this file is different in
  glitch-soc because the feature was added much earlier.
  Ran the lint fix on our own version of the file.

Merge commit 'ea10febd257b5b729a50aeb3218389763f5f4b97' into glitch-soc/merge-upstream

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.

Fix `Naming/MemoizedInstanceVariableName` cop (#25928)

Fix `Naming/AccessorMethodName` cop (#25924)

Add `forward_to_domains` parameter to `POST /api/v1/reports` (#25866)

First pass at multi-database for read replica using Rails native adapter (#25693)

Co-authored-by: emilweth <7402764+emilweth@users.noreply.github.com>

Merge pull request #2272 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

Merge branch 'main' into glitch-soc/merge-upstream

Fix `/api/v2/search` not working with following query param (#25681)

Merge pull request #2263 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

Add users index on unconfirmed_email (#25672)