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.

Claire 90528f43bc Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `config/webpack/configuration.js`: Upstream updated the `js-yaml` dependency, which changed how to call it. Those changes conflicted because that code is pretty different in glitch-soc which has to deal with its more complex theming system. Proceeded to the same compatibility changes in glitch-soc's code. - `package.json` and `yarn.lock`: Not really a conflict, just glitch-soc-specific dependencies textually too close to some dependencies updated upstream.		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	Add import/export feature for bookmarks (#14956)	4 years ago
helpers	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
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	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
support	…
validators	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
views	…
workers	Fix being able to import more than allowed number of follows (#15384)	4 years ago
rails_helper.rb	Add WebAuthn as an alternative 2FA method (#14466)	4 years ago
spec_helper.rb	…