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
announcements	Add announcements (#12662)	2020-01-23 22:00:13 +01:00
apps
instances
lists
polls
push
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
announcements_controller_spec.rb	Add announcements (#12662)	2020-01-23 22:00:13 +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
custom_emojis_controller_spec.rb
domain_blocks_controller_spec.rb
endorsements_controller_spec.rb
favourites_controller_spec.rb
filters_controller_spec.rb
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
mutes_controller_spec.rb
notifications_controller_spec.rb
polls_controller_spec.rb
reports_controller_spec.rb
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
suggestions_controller_spec.rb
trends_controller_spec.rb	Add announcements (#12662)	2020-01-23 22:00:13 +01:00