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 61631f4751 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md - app/javascript/styles/mastodon/components.scss conflicts caused by image URLs being different - app/models/status.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline - app/views/statuses/_simple_status.html.haml - config/locales/en.yml some strings were changed upstream - spec/models/status_spec.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline		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	Remove Salmon and PubSubHubbub (#11205)	5 years ago
helpers	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
lib	Merge branch 'master' into glitch-soc/merge-upstream	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	…
serializers/activitypub	Fix account URI in UpdatePollSerializer (#11194)	6 years ago
services	Merge tag 'v3.0.0' into glitch-soc/merge-upstream	5 years ago
support	…
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