~cytrogen/masto-fe

ref: 4faa4eb3c45986dd0019641fbf15a9a59e9497cf masto-fe/spec d---------
80a5c16a — Claire 2 years ago
Merge branch 'main' into glitch-soc/merge-upstream
c7c6f02a — Claire 2 years ago
Fix suspending an already-limited domain (#25603)

b052a7ed — Claire 2 years ago
Merge pull request #2256 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
178e1510 — Claire 2 years ago
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.
a5b6f6da — Claire 2 years ago
Change /api/v1/statuses/:id/history to always return at least one item (#25510)

05f9e39b — Matt Jankowski 2 years ago
Fix `RSpec/VerifiedDoubles` cop (#25469)

38433ccd — Matt Jankowski 2 years ago
Reduce `Admin::Reports::Actions` spec db activity (#25465)

602c458a — Claire 2 years ago
Add finer permission requirements for managing webhooks (#25463)

63d15d53 — Matt Jankowski 2 years ago
Speed-up on `StatusesController` spec (#25549)

0b39b9ab — Matt Jankowski 2 years ago
Speed-up on `BackupService` spec (#25527)

6ac271c2 — Daniel M Brasil 2 years ago
Migrate to request specs in `/api/v1/suggestions` (#25540)

37a9c225 — Claire 2 years ago
Add per-test timeouts to AutoStatusesCleanupScheduler tests (#24841)

ebfeaebe — Claire 2 years ago
Fix /api/v1/conversations sometimes returning empty accounts (#25499)

e53eb38a — Daniel M Brasil 2 years ago
Migrate to request specs in `/api/v1/admin/account_actions` (#25514)

fd23f502 — Claire 2 years ago
Fix wrong view being displayed when a webhook fails validation (#25464)

c78280a8 — Claire 2 years ago
Add translate="no" to outgoing mentions and links (#25524)

eba3411b — Plastikmensch 2 years ago
Re-allow title attribute in <abbr> (#2254)

* Re-allow title attribute in <abbr>

This was accidentally removed in 7623e181247b4d2227b7774143514f6e1ca9253b

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

* Add test

Add a new test to check that title attribute on <abbr> is kept.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

---------

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
dd07393e — Claire 2 years ago
Fix user settings not getting validated (#25508)

e1c9d52e — Matt Jankowski 2 years ago
Reduce `sleep` time in request pool spec (#25470)

3a65fb04 — Matt Jankowski 2 years ago
Add coverage for `UserMailer` methods (#25484)

Next