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.		2020-09-08 16:26:47 +02:00
..
accounts	Added account featured tags API (#11817)	2020-09-02 02:13:10 +02:00
admin	Make Array-creation behavior of Paginable more predictable (#14687)	2020-08-31 12:47:09 +02:00
announcements	…
apps	…
crypto	Make Array-creation behavior of Paginable more predictable (#14687)	2020-08-31 12:47:09 +02:00
featured_tags	Changed tag most_used to recently_used (#14760)	2020-09-07 17:47:41 +02:00
instances	…
lists	…
polls	…
push	…
statuses	Fix not being able to unbookmark toots when blocked by their author (#14604)	2020-08-19 19:02:06 +02:00
timelines	Merge branch 'master' into glitch-soc/merge-upstream	2020-09-08 16:26:47 +02:00
accounts_controller.rb	…
announcements_controller.rb	…
apps_controller.rb	…
blocks_controller.rb	…
bookmarks_controller.rb	Make Array-creation behavior of Paginable more predictable (#14687)	2020-08-31 12:47:09 +02:00
conversations_controller.rb	Make Array-creation behavior of Paginable more predictable (#14687)	2020-08-31 12:47:09 +02:00
custom_emojis_controller.rb	…
directories_controller.rb	…
domain_blocks_controller.rb	…
endorsements_controller.rb	…
favourites_controller.rb	Make Array-creation behavior of Paginable more predictable (#14687)	2020-08-31 12:47:09 +02:00
featured_tags_controller.rb	…
filters_controller.rb	…
follow_requests_controller.rb	…
instances_controller.rb	…
lists_controller.rb	Add configuration option to filter replies in lists (#9205)	2020-09-01 13:31:28 +02:00
markers_controller.rb	…
media_controller.rb	Add customizable thumbnails for audio and video attachments (#14145)	2020-06-29 13:56:55 +02:00
mutes_controller.rb	…
notifications_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-08-30 16:13:08 +02:00
polls_controller.rb	…
preferences_controller.rb	…
reports_controller.rb	…
scheduled_statuses_controller.rb	Make Array-creation behavior of Paginable more predictable (#14687)	2020-08-31 12:47:09 +02:00
statuses_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-22 13:38:17 +02:00
streaming_controller.rb	…
suggestions_controller.rb	…
trends_controller.rb	…