Claire e855df149b Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.env.production.sample`: Upstream added new configuration options, uncommented by default. Commented them. - `Gemfile.lock`: Upstream updated dependencies textually close to glitch-soc-specific dependencies. Updated those upstream dependencies.		2021-10-25 20:28:51 +02:00
..
controllers	Merge branch 'main' into glitch-soc/merge-upstream	2021-10-25 20:28:51 +02:00
fabricators	Add feature to automatically delete old toots (#16529)	2021-08-09 23:11:50 +02:00
features
fixtures	Fix some link previews being incorrectly generated from other prior links (#16885)	2021-10-21 20:39:35 +02:00
helpers
lib	Merge branch 'main' into glitch-soc/merge-upstream	2021-09-26 18:28:59 +02:00
mailers	Add Ruby 3.0 support (#16046)	2021-05-06 14:22:54 +02:00
models	Merge branch 'main' into glitch-soc/merge-upstream	2021-10-25 20:28:51 +02:00
policies
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-10-25 20:28:51 +02:00
support
validators	Merge branch 'main' into glitch-soc/merge-upstream	2021-04-20 12:17:14 +02:00
views	Merge branch 'main' into glitch-soc/merge-upstream	2021-10-13 15:50:24 +02:00
workers	Fix followers synchronization mechanism not working when URI has empty path (#16510)	2021-08-11 17:48:42 +02:00
rails_helper.rb
spec_helper.rb