Thibaut Girka c0dc247bce 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`.		2019-05-23 19:01:30 +02:00
..
chewy	Add type, limit, offset, min_id, max_id, account_id to search API (#10091)	2019-02-26 15:21:36 +01:00
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-23 19:01:30 +02:00
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-10 09:16:08 +02:00
javascript	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-23 19:01:30 +02:00
lib	Allow rel=tag in status text	2019-05-23 12:28:33 +02:00
mailers	Fix error in AdminMailer#new_pending_account (#10264)	2019-03-14 14:20:22 +01:00
models	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-23 19:01:30 +02:00
policies	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-14 17:17:20 +01:00
presenters	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-08 15:57:56 +02:00
serializers	Export fallback content type and use it as default in WebUI	2019-05-17 23:51:14 +02:00
services	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-18 10:04:32 +02:00
validators	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-19 21:53:44 +02:00
views	Change bio limit from 160 to 500 (#10790)	2019-05-19 22:51:44 +02:00
workers	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-23 19:01:30 +02:00