Claire 3869daef09 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `package.json`:
  Not really a conflict, upstream updated a dependency textually adjacent to a
  glitch-soc-only one.
  Updated the dependency as upstream did.

2022-05-03 10:16:49 +02:00

..

controllers

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

2022-04-28 18:16:42 +02:00

fabricators

…

features

…

fixtures

…

helpers

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

2022-03-08 20:22:54 +01:00

lib

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

2022-04-28 18:16:42 +02:00

mailers

Fix failure when sending warning emails with custom text (#17983)

2022-04-07 14:47:30 +02:00

models

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

2022-04-28 18:16:42 +02:00

policies

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

2022-03-08 20:22:54 +01:00

presenters

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

2022-03-08 20:22:54 +01:00

requests

…

routing

…

serializers/activitypub

…

services

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

2022-05-03 10:16:49 +02:00

support

…

validators

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

2022-05-01 16:52:27 +02:00

views

…

workers

Fix single Redis connection being used across all threads (#18135)

2022-04-28 17:47:34 +02:00

rails_helper.rb

Fix single Redis connection being used across all threads (#18135)

2022-04-28 17:47:34 +02:00

spec_helper.rb

…