Thibaut Girka c790ecb14d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Conflict due to upstream adding a new parameter (with_rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/services/post_status_service.rb`: Conflict due to upstream adding a new parameter (rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/views/settings/preferences/appearance/show.html.haml`: Conflict due to us not exposing theme settings here (as we have a different flavour/skin menu). Took upstream change, while still not exposing theme settings. - `config/webpack/shared.js`: Coding style fixes for a part we have rewritten. Discarded upstream changes.		2020-03-08 19:38:53 +01:00
..
accounts	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-04 23:04:42 +01:00
admin	Add moderation API (#9387)	2019-06-20 02:52:34 +02:00
announcements	Add announcements (#12662)	2020-01-23 22:00:13 +01:00
apps	Use raw status code on have_http_status (#7214)	2018-04-21 21:35:07 +02:00
instances	Add specs for Api::V1::Instances::PeersController (#9546)	2018-12-17 11:35:55 +01:00
lists	Add more granular OAuth scopes (#7929)	2018-07-05 18:31:35 +02:00
polls	Add polls (#10111)	2019-03-03 22:18:23 +01:00
push	Add REST API for Web Push Notifications subscriptions (#7445)	2018-05-11 11:49:12 +02:00
statuses	Fix leak of arbitrary statuses through unfavourite action in REST API (#13161)	2020-02-27 12:32:54 +01:00
timelines	Fix tests being broken because of different default setting	2019-09-13 20:28:22 +02:00
accounts_controller_spec.rb	Add REST API for creating an account (#9572)	2018-12-24 19:12:38 +01:00
announcements_controller_spec.rb	Add announcements (#12662)	2020-01-23 22:00:13 +01:00
apps_controller_spec.rb	Use raw status code on have_http_status (#7214)	2018-04-21 21:35:07 +02:00
blocks_controller_spec.rb	Add more granular OAuth scopes (#7929)	2018-07-05 18:31:35 +02:00
bookmarks_controller_spec.rb	Support min_id-based pagination for bookmarks (#12381)	2019-11-17 17:09:41 +01:00
conversations_controller_spec.rb	Add scheduled statuses (#9706)	2019-01-05 12:43:28 +01:00
custom_emojis_controller_spec.rb	Use raw status code on have_http_status (#7214)	2018-04-21 21:35:07 +02:00
domain_blocks_controller_spec.rb	Add more granular OAuth scopes (#7929)	2018-07-05 18:31:35 +02:00
endorsements_controller_spec.rb	Add spec for Api::V1::EndorsementsController (#9543)	2018-12-17 11:32:44 +01:00
favourites_controller_spec.rb	Support min_id-based pagination in REST API (#8736)	2018-09-28 02:23:45 +02:00
filters_controller_spec.rb	Add polls (#10111)	2019-03-03 22:18:23 +01:00
follow_requests_controller_spec.rb	Add updated relationship to follow request API responses (#11800)	2019-09-10 20:56:42 +02:00
instances_controller_spec.rb	Use raw status code on have_http_status (#7214)	2018-04-21 21:35:07 +02:00
lists_controller_spec.rb	Add more granular OAuth scopes (#7929)	2018-07-05 18:31:35 +02:00
markers_controller_spec.rb	Add timeline read markers API (#11762)	2019-09-06 13:55:51 +02:00
media_controller_spec.rb	Not to skip executable specs (#9753)	2019-01-10 15:12:31 +01:00
mutes_controller_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-27 18:09:28 +02:00
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	Fix poll API not requiring authentication on non-public polls (#10960)	2019-06-04 20:10:26 +02:00
reports_controller_spec.rb	Support min_id-based pagination in REST API (#8736)	2018-09-28 02:23:45 +02:00
statuses_controller_spec.rb	Add specific rate limits for posting and following (#13172)	2020-03-08 15:17:39 +01:00
streaming_controller_spec.rb	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
suggestions_controller_spec.rb	Re-add follow recommendations API (#7918)	2018-07-03 01:47:56 +02:00
trends_controller_spec.rb	Add announcements (#12662)	2020-01-23 22:00:13 +01:00