Merge branch 'main' into glitch-soc/merge-upstream
Fix suspending an already-limited domain (#25603)
Merge pull request #2256 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream
Conflicts:
- `app/models/user_settings.rb`:
Upstream added a constraint on a setting textually close
to glitch-soc-only settings.
Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream added support for the `translate` attribute on a few elements,
where glitch-soc had a different set of allowed elements and attributes.
Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
Upstream refactored to use RSpec's `instance_double` instead of `double`,
but glitch-soc had changes to tests due to configurable max toot chars.
Applied upstream's changes while keeping tests against configurable max
toot chars.
Change /api/v1/statuses/:id/history to always return at least one item (#25510)
Fix `RSpec/VerifiedDoubles` cop (#25469)
Reduce `Admin::Reports::Actions` spec db activity (#25465)
Add finer permission requirements for managing webhooks (#25463)
Speed-up on `StatusesController` spec (#25549)
Speed-up on `BackupService` spec (#25527)
Migrate to request specs in `/api/v1/suggestions` (#25540)
Add per-test timeouts to AutoStatusesCleanupScheduler tests (#24841)
Fix /api/v1/conversations sometimes returning empty accounts (#25499)
Migrate to request specs in `/api/v1/admin/account_actions` (#25514)
Fix wrong view being displayed when a webhook fails validation (#25464)
Add translate="no" to outgoing mentions and links (#25524)
Fix user settings not getting validated (#25508)
Reduce `sleep` time in request pool spec (#25470)
Add coverage for `UserMailer` methods (#25484)