Claire b3bf32a21e Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/reports/show.html.haml`: Conflicts due to glitch-soc's theming system.		2022-01-17 10:45:25 +01:00
..
controllers	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-17 10:45:25 +01:00
fabricators	Add notifications for statuses deleted by moderators (#17204)	2022-01-17 09:41:33 +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	2021-11-25 23:50:35 +01:00
lib	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-17 08:28:52 +01:00
mailers	Add notifications for statuses deleted by moderators (#17204)	2022-01-17 09:41:33 +01:00
models	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-17 10:45:25 +01:00
policies	Merge branch 'main' into glitch-soc/merge-upstream	2021-12-18 11:44:54 +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	2021-12-18 11:44:54 +01:00
support
validators	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-17 08:28:52 +01:00
views	Merge branch 'main' into glitch-soc/merge-upstream	2021-10-13 15:50:24 +02:00
workers	Add ability to purge undeliverable domains from admin interface (#16686)	2021-12-17 23:01:21 +01:00
rails_helper.rb	Add WebAuthn as an alternative 2FA method (#14466)	2020-08-24 16:46:27 +02:00
spec_helper.rb