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 ff67385cfb Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md discarded upstream changes - app/controllers/api/v1/bookmarks_controller.rb finally merged upstream, some code style fixes and slightly changed pagination code - app/controllers/application_controller.rb changed upstream to always return HTML error pages slight conflict caused by theming code - app/models/bookmark.rb finally merged upstream, no real conflict - spec/controllers/api/v1/bookmarks_controller_spec.rb finally merged upstream, slightly changed pagination code		5 years ago
..
accounts	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
admin	Add moderation API (#9387)	5 years ago
apps	…
instances	Add specs for Api::V1::Instances::PeersController (#9546)	6 years ago
lists	…
polls	Add polls (#10111)	6 years ago
push	…
statuses	Add bookmarks (#7107)	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
apps_controller_spec.rb	…
blocks_controller_spec.rb	…
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	…
domain_blocks_controller_spec.rb	…
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	…
lists_controller_spec.rb	…
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	Remove deprecated REST API `GET /api/v1/statuses/:id/card` (#11213)	5 years ago
streaming_controller_spec.rb	Lint pass (#8876)	6 years ago
suggestions_controller_spec.rb	…