Claire 7782e4dc0d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/about_controller.rb`: Minor conflict caused by glitch-soc's theming system. Ported upstream changes.		2020-12-10 09:41:49 +01:00
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-10 09:41:49 +01:00
fabricators	Add IP-based rules (#14963)	2020-10-12 16:33:49 +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-04-04 21:47:37 +02:00
lib	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-09 14:42:33 +01:00
mailers	refactor: add email previews for WebAuthn emails (#14658)	2020-08-25 01:21:11 +02:00
models	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-12 22:13:57 +01:00
policies	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-08 14:20:35 +01:00
presenters
requests
routing
serializers/activitypub
services	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-20 13:27:48 +01:00
support	Fix base64-encoded file uploads not being possible (#12748)	2020-01-04 01:54:07 +01:00
validators	Merge branch 'master' into glitch-soc/merge-upstream	2020-08-13 22:17:29 +02:00
views
workers	Add follower synchronization mechanism (#14510)	2020-10-21 18:04:09 +02:00
rails_helper.rb	Add WebAuthn as an alternative 2FA method (#14466)	2020-08-24 16:46:27 +02:00
spec_helper.rb