Claire 2810231180 Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream ...

Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
  Upstream renamed a helper method everywhere.
  There was one glitch-soc line involving changes because of the local-only post
  feature.
  Ported upstream's change.

2024-05-16 19:30:10 +02:00

..

accounts

Rename cache_* methods to preload_* in controller concern (#30209)

2024-05-16 08:03:46 +00:00

admin

Fix not being able to block a subdomain of an already-blocked domain through the API (#30119)

2024-05-02 20:56:21 +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

Add not_featured_by scope to Tag (#28815)

2024-04-17 10:05:38 +00:00

instances

…

lists

Move repeated insert_pagination_headers method to api base class (#29606)

2024-03-18 10:11:53 +00:00

notifications

Rename cache_* methods to preload_* in controller concern (#30209)

2024-05-16 08:03:46 +00:00

peers

Add coverage for api/v1/peers/search endpoint and extract controller query to Instance scope (#28796)

2024-01-18 15:57:10 +00:00

polls

…

profile

…

push

Fix race condition in POST /api/v1/push/subscription (#30166)

2024-05-06 12:41:14 +00:00

statuses

Add scope Status.distributable_visibility (#29950)

2024-04-16 13:16:54 +00:00

timelines

Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream

2024-05-16 19:30:10 +02:00

trends

Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream

2024-05-16 19:30:10 +02:00

accounts_controller.rb

Add API to get multiple accounts and statuses (#27871)

2024-05-06 15:19:15 +00:00

announcements_controller.rb

…

annual_reports_controller.rb

Add annual reports for accounts (#28693)

2024-01-24 09:38:10 +00:00

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

Rename cache_* methods to preload_* in controller concern (#30209)

2024-05-16 08:03:46 +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

Eager loading fixes for api/ controllers (#28848)

2024-01-23 11:41:54 +00:00

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

Rename cache_* methods to preload_* in controller concern (#30209)

2024-05-16 08:03:46 +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

Improve api/v1/markers#create performance against simultaneous requests (#28718)

2024-01-15 09:47:25 +00:00

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 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream

2024-05-16 19:30:10 +02: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 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream

2024-05-16 19:30:10 +02:00

streaming_controller.rb

…

suggestions_controller.rb

…

tags_controller.rb

…