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 0fd3f87ea2 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.		5 years ago
..
accounts	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
admin	Add moderation API (#9387)	5 years ago
announcements	Add announcements (#12662)	5 years ago
apps	Use raw status code on have_http_status (#7214)	7 years ago
instances	Add specs for Api::V1::Instances::PeersController (#9546)	6 years ago
lists	Add more granular OAuth scopes (#7929)	6 years ago
polls	Add polls (#10111)	6 years ago
push	Add REST API for Web Push Notifications subscriptions (#7445)	7 years ago
statuses	Fix leak of arbitrary statuses through unfavourite action in REST API (#13161)	5 years ago
timelines	Fix tests being broken because of different default setting	5 years ago
accounts_controller_spec.rb	Add REST API for creating an account (#9572)	6 years ago
announcements_controller_spec.rb	Add announcements (#12662)	5 years ago
apps_controller_spec.rb	Use raw status code on have_http_status (#7214)	7 years ago
blocks_controller_spec.rb	Add more granular OAuth scopes (#7929)	6 years ago
bookmarks_controller_spec.rb	Support min_id-based pagination for bookmarks (#12381)	5 years ago
conversations_controller_spec.rb	Add scheduled statuses (#9706)	6 years ago
custom_emojis_controller_spec.rb	Use raw status code on have_http_status (#7214)	7 years ago
domain_blocks_controller_spec.rb	Add more granular OAuth scopes (#7929)	6 years ago
endorsements_controller_spec.rb	Add spec for Api::V1::EndorsementsController (#9543)	6 years ago
favourites_controller_spec.rb	Support min_id-based pagination in REST API (#8736)	6 years ago
filters_controller_spec.rb	Add polls (#10111)	6 years ago
follow_requests_controller_spec.rb	Add updated relationship to follow request API responses (#11800)	5 years ago
instances_controller_spec.rb	Use raw status code on have_http_status (#7214)	7 years ago
lists_controller_spec.rb	Add more granular OAuth scopes (#7929)	6 years ago
markers_controller_spec.rb	Add timeline read markers API (#11762)	5 years ago
media_controller_spec.rb	Not to skip executable specs (#9753)	6 years ago
mutes_controller_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
notifications_controller_spec.rb	Add `account_id` param to `GET /api/v1/notifications` (#10796)	6 years ago
polls_controller_spec.rb	Fix poll API not requiring authentication on non-public polls (#10960)	6 years ago
reports_controller_spec.rb	Support min_id-based pagination in REST API (#8736)	6 years ago
statuses_controller_spec.rb	Add specific rate limits for posting and following (#13172)	5 years ago
streaming_controller_spec.rb	Lint pass (#8876)	6 years ago
suggestions_controller_spec.rb	Re-add follow recommendations API (#7918)	6 years ago
trends_controller_spec.rb	Add announcements (#12662)	5 years ago