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 e4f8679eae Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/models/form/admin_settings.rb`: New setting added upstream. Ported it. - `app/views/statuses/_simple_status.html.haml`: Upstream removed RTL classes. Did the same. - `config/settings.yml`: New setting added upstream. Ported 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	Add submit button to the top of preferences pages (#13068)	5 years ago
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	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
requests	Fix localization test failing due to order of locale definitions (#12393)	5 years ago
routing	…
serializers/activitypub	Fix account URI in UpdatePollSerializer (#11194)	6 years ago
services	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
support	Fix base64-encoded file uploads not being possible (#12748)	5 years ago
validators	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
views	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
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	Move rspec examples to tmp dir (#12539)	5 years ago