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

2019-11-20 15:36:09 +01:00

..

accounts

Merge branch 'master' into glitch-soc/merge-upstream

2019-11-20 15:36:09 +01:00

admin

Add moderation API (#9387)

2019-06-20 02:52:34 +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

Add bookmarks (#7107)

2019-11-13 23:02:10 +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

apps_controller_spec.rb

…

blocks_controller_spec.rb

…

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

…

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

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

…

lists_controller_spec.rb

…

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

Remove deprecated REST API GET /api/v1/statuses/:id/card (#11213)

2019-07-05 02:15:24 +02:00

streaming_controller_spec.rb

Lint pass (#8876)

2018-10-04 12:36:53 +02:00

suggestions_controller_spec.rb

…