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
..
accounts	Change bio limit from 160 to 500 (#10790)	2019-05-19 22:51:44 +02:00
apps
instances	Add specs for Api::V1::Instances::PeersController (#9546)	2018-12-17 11:35:55 +01:00
lists
polls	Add polls (#10111)	2019-03-03 22:18:23 +01:00
push
statuses	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-05 15:23:57 +02:00
timelines	Add scheduled statuses (#9706)	2019-01-05 12:43:28 +01:00
accounts_controller_spec.rb	Add REST API for creating an account (#9572)	2018-12-24 19:12:38 +01:00
apps_controller_spec.rb
blocks_controller_spec.rb
bookmarks_controller_spec.rb
conversations_controller_spec.rb	Add scheduled statuses (#9706)	2019-01-05 12:43:28 +01:00
custom_emojis_controller_spec.rb
domain_blocks_controller_spec.rb
endorsements_controller_spec.rb	Add spec for Api::V1::EndorsementsController (#9543)	2018-12-17 11:32:44 +01:00
favourites_controller_spec.rb
filters_controller_spec.rb	Add polls (#10111)	2019-03-03 22:18:23 +01:00
follow_requests_controller_spec.rb
follows_controller_spec.rb
instances_controller_spec.rb
lists_controller_spec.rb
media_controller_spec.rb	Not to skip executable specs (#9753)	2019-01-10 15:12:31 +01:00
mutes_controller_spec.rb
notifications_controller_spec.rb	Add account_id param to GET /api/v1/notifications (#10796)	2019-05-21 13:28:49 +02:00
polls_controller_spec.rb	Add polls (#10111)	2019-03-03 22:18:23 +01:00
reports_controller_spec.rb
search_controller_spec.rb
statuses_controller_spec.rb
streaming_controller_spec.rb
suggestions_controller_spec.rb