Claire 360590ecd8 Merge commit 'a3902997440c71f161e392f1ad6c5cdcf6aba95d' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/accounts_controller.rb`: Conflict due to glitch-soc's local-only posting feature. Refactored as upstream did but kept local changes. - `app/lib/account_statuses_filter.rb`: Conflict due to glitch-soc's local-only posting feature. Refactored as upstream did but kept local changes.		2024-05-01 19:30:41 +02:00
..
accounts	Move repeated `insert_pagination_headers` method to api base class (#29606)	2024-03-18 10:11:53 +00:00
admin	Move repeated `insert_pagination_headers` method to api base class (#29606)	2024-03-18 10:11:53 +00:00
announcements	…
apps	…
crypto	Move repeated `insert_pagination_headers` method to api base class (#29606)	2024-03-18 10:11:53 +00:00
emails	…
featured_tags	Fix results/query in `api/v1/featured_tags/suggestions` (#29597)	2024-03-22 15:08:27 +00:00
instances	…
lists	Move repeated `insert_pagination_headers` method to api base class (#29606)	2024-03-18 10:11:53 +00:00
notifications	Move repeated `insert_pagination_headers` method to api base class (#29606)	2024-03-18 10:11:53 +00:00
peers	…
polls	…
profile	…
push	…
statuses	Add scope `Status.distributable_visibility` (#29950)	2024-04-16 13:16:54 +00:00
timelines	Merge commit 'ffc5be4820ed7bad4656489f096230dd7965140b' into glitch-soc/merge-upstream	2024-03-19 19:21:12 +01:00
trends	Merge commit 'ffc5be4820ed7bad4656489f096230dd7965140b' into glitch-soc/merge-upstream	2024-03-19 19:21:12 +01:00
accounts_controller.rb	…
announcements_controller.rb	…
annual_reports_controller.rb	…
apps_controller.rb	…
blocks_controller.rb	Move repeated `insert_pagination_headers` method to api base class (#29606)	2024-03-18 10:11:53 +00:00
bookmarks_controller.rb	Move repeated `insert_pagination_headers` method to api base class (#29606)	2024-03-18 10:11:53 +00:00
conversations_controller.rb	Move repeated `insert_pagination_headers` method to api base class (#29606)	2024-03-18 10:11:53 +00:00
custom_emojis_controller.rb	…
directories_controller.rb	…
domain_blocks_controller.rb	Move repeated `insert_pagination_headers` method to api base class (#29606)	2024-03-18 10:11:53 +00:00
endorsements_controller.rb	Move repeated `insert_pagination_headers` method to api base class (#29606)	2024-03-18 10:11:53 +00:00
favourites_controller.rb	Move repeated `insert_pagination_headers` method to api base class (#29606)	2024-03-18 10:11:53 +00:00
featured_tags_controller.rb	…
filters_controller.rb	…
follow_requests_controller.rb	Move repeated `insert_pagination_headers` method to api base class (#29606)	2024-03-18 10:11:53 +00:00
followed_tags_controller.rb	Move repeated `insert_pagination_headers` method to api base class (#29606)	2024-03-18 10:11:53 +00:00
instances_controller.rb	…
invites_controller.rb	…
lists_controller.rb	…
markers_controller.rb	…
media_controller.rb	…
mutes_controller.rb	Move repeated `insert_pagination_headers` method to api base class (#29606)	2024-03-18 10:11:53 +00:00
notifications_controller.rb	Merge commit 'ffc5be4820ed7bad4656489f096230dd7965140b' into glitch-soc/merge-upstream	2024-03-19 19:21:12 +01:00
polls_controller.rb	…
preferences_controller.rb	…
reports_controller.rb	…
scheduled_statuses_controller.rb	Move repeated `insert_pagination_headers` method to api base class (#29606)	2024-03-18 10:11:53 +00:00
statuses_controller.rb	Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream	2024-02-24 14:27:43 +01:00
streaming_controller.rb	…
suggestions_controller.rb	…
tags_controller.rb	…