Thibaut Girka 48f0f3ffee Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `.github/ISSUE_TEMPLATE/bug_report.md`: Upstream added the `bug` label to bug reports. Did the same. - `app/services/fan_out_on_write_service.rb`: Upstream put DMs back into timelines, glitch-soc was already doing it. Ignored upstream changes.		2020-11-20 13:27:48 +01:00
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-20 13:27:48 +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
lib	Merge branch 'master' into glitch-soc/merge-upstream	2020-10-21 19:10:50 +02: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	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-14 17:17:20 +01:00
requests
routing
serializers/activitypub
services	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-20 13:27:48 +01:00
support
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	Move rspec examples to tmp dir (#12539)	2019-12-02 19:55:08 +01:00