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 d445d5833e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/account.rb - app/views/settings/profiles/show.html.haml - spec/controllers/api/v1/accounts/credentials_controller_spec.rb Conflicts were due to an increase in account bio length upstream, which is already covered in glitch-soc through `MAX_BIO_CHARS`.		5 years ago
..
chewy	Add type, limit, offset, min_id, max_id, account_id to search API (#10091)	6 years ago
controllers	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
helpers	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
javascript	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
lib	Allow rel=tag in status text	5 years ago
mailers	Fix error in AdminMailer#new_pending_account (#10264)	6 years ago
models	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
policies	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
presenters	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
serializers	Export fallback content type and use it as default in WebUI	5 years ago
services	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
validators	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
views	Change bio limit from 160 to 500 (#10790)	5 years ago
workers	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago