Merge pull request #2291 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
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 '610cf6c3713e414995ea1a57110db400ccb88dd2' into glitch-soc/merge-upstream
Conflicts:
- `app/models/trends.rb`:
Conflict due to glitch-soc's code splitting trends mailing depending on type.
Ported upstream's 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.
Fix `Naming/MemoizedInstanceVariableName` cop (#25928)
Change searching with # to include account index (#25638)
Fix remote accounts being possibly persisted to database with incomplete protocol values (#25886)
Add `forward_to_domains` parameter to `POST /api/v1/reports` (#25866)
Refactor `NotificationMailer` to use parameterization (#25718)
Admin mailer parameterization (#25759)
Add forwarding of reported replies to servers being replied to (#25341)
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
Merge branch 'main' into glitch-soc/merge-upstream
Revert "Rails 7 update" (#25667)
Fix ResolveURLService not resolving local URLs for remote content (#25637)