Claire b61c3ddff8 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream added some text, but our README is completely different. Kept our README unchanged.		2022-01-16 18:11:20 +01:00
..
controllers	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-16 18:11:20 +01:00
fabricators	Remove Keybase integration (#17045)	2021-11-26 05:58:18 +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	2021-11-26 22:53:55 +01:00
mailers	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
models	Merge branch 'main' into glitch-soc/merge-upstream	2021-12-16 16:20:44 +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	…
routing	…
serializers/activitypub	…
services	Merge branch 'main' into glitch-soc/merge-upstream	2021-12-18 11:44:54 +01:00
support	…
validators	…
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	…
spec_helper.rb	…