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 9748f074a3 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/api/v1/timelines/public_controller.rb - app/lib/feed_manager.rb - app/models/status.rb - app/services/precompute_feed_service.rb - app/workers/feed_insert_worker.rb - spec/models/status_spec.rb All conflicts are due to upstream refactoring feed management and us having local-only toots on top of that. Rewrote local-only toots management for upstream's changes.		4 years ago
..
accounts	Added account featured tags API (#11817)	4 years ago
admin	Make Array-creation behavior of Paginable more predictable (#14687)	4 years ago
announcements	Add announcements (#12662)	4 years ago
apps	Remove useless `respond_to` calls (#13208)	4 years ago
crypto	Make Array-creation behavior of Paginable more predictable (#14687)	4 years ago
featured_tags	Changed tag most_used to recently_used (#14760)	4 years ago
instances	Remove useless `respond_to` calls (#13208)	4 years ago
lists	Extract counters from accounts table to account_stats table (#9295)	6 years ago
polls	Add more tests for ActivityPub controllers (#13585)	4 years ago
push	Add more tests for ActivityPub controllers (#13585)	4 years ago
statuses	Fix not being able to unbookmark toots when blocked by their author (#14604)	4 years ago
timelines	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
accounts_controller.rb	Add specific rate limits for posting and following (#13172)	4 years ago
announcements_controller.rb	Fix dismissing an announcement twice raising an obscure error (#13124)	4 years ago
apps_controller.rb	Add whitelist mode (#11291)	5 years ago
blocks_controller.rb	Remove useless `respond_to` calls (#13208)	4 years ago
bookmarks_controller.rb	Make Array-creation behavior of Paginable more predictable (#14687)	4 years ago
conversations_controller.rb	Make Array-creation behavior of Paginable more predictable (#14687)	4 years ago
custom_emojis_controller.rb	Remove useless `respond_to` calls (#13208)	4 years ago
directories_controller.rb	Add profile directory to web UI (#11688)	5 years ago
domain_blocks_controller.rb	Remove useless `respond_to` calls (#13208)	4 years ago
endorsements_controller.rb	Remove useless `respond_to` calls (#13208)	4 years ago
favourites_controller.rb	Make Array-creation behavior of Paginable more predictable (#14687)	4 years ago
featured_tags_controller.rb	Add featured tags API (#11778)	5 years ago
filters_controller.rb	Remove useless `respond_to` calls (#13208)	4 years ago
follow_requests_controller.rb	Add updated relationship to follow request API responses (#11800)	5 years ago
instances_controller.rb	Remove useless `respond_to` calls (#13208)	4 years ago
lists_controller.rb	Add configuration option to filter replies in lists (#9205)	4 years ago
markers_controller.rb	Add timeline read markers API (#11762)	5 years ago
media_controller.rb	Add customizable thumbnails for audio and video attachments (#14145)	4 years ago
mutes_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
notifications_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
polls_controller.rb	Add more tests for ActivityPub controllers (#13585)	4 years ago
preferences_controller.rb	Remove useless `respond_to` calls (#13208)	4 years ago
reports_controller.rb	Add rate limit for reporting (#13390)	4 years ago
scheduled_statuses_controller.rb	Make Array-creation behavior of Paginable more predictable (#14687)	4 years ago
statuses_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
streaming_controller.rb	Remove useless `respond_to` calls (#13208)	4 years ago
suggestions_controller.rb	Remove useless `respond_to` calls (#13208)	4 years ago
trends_controller.rb	Remove useless `respond_to` calls (#13208)	4 years ago