You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka de5cc20dd8 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Conflict caused because of glitch-soc's theming system. Took upstream's new code and applied the theming system changes on top of it. - `app/controllers/concerns/two_factor_authentication_concern.rb`: Conflict caused because of glitch-soc's theming system. Took upstream's new code and applied the theming system changes on top of it.		4 years ago
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
fabricators	Add IP-based rules (#14963)	4 years ago
features	…
fixtures	…
helpers	…
lib	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
mailers	refactor: add email previews for WebAuthn emails (#14658)	4 years ago
models	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
policies	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
presenters	…
requests	…
routing	…
serializers/activitypub	…
services	Add tests	4 years ago
support	…
validators	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
views	…
workers	Add follower synchronization mechanism (#14510)	4 years ago
rails_helper.rb	Add WebAuthn as an alternative 2FA method (#14466)	4 years ago
spec_helper.rb	…