Claire 3d25fe0426 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Upstream changed the workflow a bit. Conflict comes from us pushing to ghcr while upstream pushes to dockerhub. Ported the upstream changes while still pushing to ghcr.		2022-02-23 18:13:12 +01:00
..
controllers	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-23 18:13:12 +01:00
fabricators	Add appeals (#17364)	2022-02-14 21:27:53 +01:00
features
fixtures	Fix some link previews being incorrectly generated from other prior links (#16885)	2021-10-21 20:39:35 +02:00
helpers	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-09 17:28:33 +01:00
lib	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-17 10:58:44 +01:00
mailers	Add appeals (#17364)	2022-02-14 21:27:53 +01:00
models	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-23 18:13:12 +01:00
policies	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-10 19:09:27 +01:00
presenters	Change references to tootsuite/mastodon to mastodon/mastodon (#16491)	2021-07-13 15:46:20 +02:00
requests	Further preparation for Rails 6 (#15916)	2021-03-19 02:45:34 +01:00
routing
serializers/activitypub
services	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-23 18:13:12 +01:00
support
validators	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-23 18:13:12 +01:00
views	Merge branch 'main' into glitch-soc/merge-upstream	2021-10-13 15:50:24 +02:00
workers	Improve tests involving push_bulk (#17508)	2022-02-10 19:42:45 +01:00
rails_helper.rb	Add WebAuthn as an alternative 2FA method (#14466)	2020-08-24 16:46:27 +02:00
spec_helper.rb	Improve tests involving push_bulk (#17508)	2022-02-10 19:42:45 +01:00