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 41a98b6543 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md - app/helpers/statuses_helper.rb Upstream moved account helpers to their own file, we had extra helpers there, moved too. - app/lib/sanitize_config.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - config/locales/simple_form.en.yml - spec/lib/sanitize_config_spec.rb		5 years ago
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
fabricators	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
features	Change unconfirmed user login behaviour (#11375)	5 years ago
fixtures	Add noopener and/or noreferrer (#12202)	5 years ago
helpers	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
lib	Add noopener and/or noreferrer (#12202)	5 years ago
mailers	Add password challenge to 2FA settings, e-mail notifications (#11878)	5 years ago
models	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
policies	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
presenters	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
requests	Remove XML version of Webfinger and remove links to Atom feeds (#11460)	5 years ago
routing	Move create/destroy actions for api/v1/statuses to namespace (#3678)	8 years ago
serializers/activitypub	Fix account URI in UpdatePollSerializer (#11194)	6 years ago
services	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
support	Remove empty strings (#5732)	7 years ago
validators	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
views	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
workers	Add domain block notes (#11515)	5 years ago
rails_helper.rb	Fix records not being indexed sometimes (#12024)	5 years ago
spec_helper.rb	Add ActivityPub actor representing the entire server (#11321)	5 years ago