Claire 61ef81c548 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `spec/models/status_spec.rb`: Upstream added tests too close to glitch-soc-specific tests. Kept both tests.		2022-01-23 18:24:01 +01:00
..
controllers	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-19 23:52:48 +01:00
fabricators	Add support for editing for published statuses (#16697)	2022-01-19 22:37:27 +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-19 23:52:48 +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-23 18:24:01 +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	2022-01-19 23:52:48 +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 support for editing for published statuses (#16697)	2022-01-19 22:37:27 +01:00
rails_helper.rb
spec_helper.rb