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 8c3c27bf06 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/accounts_controller.rb`: Upstream change too close to a glitch-soc change related to instance-local toots. Merged upstream changes. - `app/services/fan_out_on_write_service.rb`: Minor conflict due to glitch-soc's handling of Direct Messages, merged upstream changes. - `yarn.lock`: Not really a conflict, caused by glitch-soc-only dependencies being textually too close to updated upstream dependencies. Merged upstream changes.		4 years ago
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
fabricators	Add WebAuthn as an alternative 2FA method (#14466)	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	…
presenters	…
requests	…
routing	…
serializers/activitypub	…
services	…
support	…
validators	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
views	…
workers	…
rails_helper.rb	Add WebAuthn as an alternative 2FA method (#14466)	4 years ago
spec_helper.rb	…