Claire 50b430d9a2 Merge branch 'main' into glitch-soc/merge-upstream ... - `app/views/statuses/_simple_status.html.haml`: Small markup change in glitch-soc, on a line that has been modified by upstream. Ported upstream changes.		2021-05-07 18:21:59 +02:00
..
controllers	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-07 18:21:59 +02:00
fabricators	Add canonical e-mail blocks for suspended accounts (#16049)	2021-04-17 03:14:25 +02:00
features
fixtures	Add import/export feature for bookmarks (#14956)	2020-11-19 17:48:13 +01:00
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-15 14:27:06 +01:00
lib	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-07 18:21: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-05-07 18:21:59 +02:00
policies	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-08 14:20:35 +01:00
presenters	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-07 18:21:59 +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-05-07 18:21:59 +02:00
support
validators	Merge branch 'main' into glitch-soc/merge-upstream	2021-04-20 12:17:14 +02:00
views
workers	Change Web Push API deliveries to use request pooling (#16014)	2021-04-12 14:25:34 +02:00
rails_helper.rb
spec_helper.rb