Claire 876aa35350 Merge commit 'ffc5be4820ed7bad4656489f096230dd7965140b' into glitch-soc/merge-upstream ...

Conflicts:
- `package.json`:
  Upstream updated a dependency that is on an adjacent line to a
  glitch-soc-only dependency in that file.
  Updated as upstream did.
- `yarn.lock`:
  Upstream updated a dependency that is on an adjacent line to a
  glitch-soc-only dependency in that file.
  Updated as upstream did.

2024-03-19 19:21:12 +01: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

Add announcements (#12662)

2020-01-23 22:00:13 +01:00

apps

Feature: Allow token introspection without read scope (#27142)

2023-10-18 14:10:07 +02:00

crypto

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

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

emails

Fix HTTP 500 in /api/v1/emails/check_confirmation (#25595)

2023-07-02 00:05:44 +02:00

featured_tags

Add ability to follow hashtags (#18809)

2022-07-17 13:49:29 +02:00

instances

Convert /instances/* controller specs to request specs (#27988)

2023-11-20 11:05:28 +00:00

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

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

Add more tests for ActivityPub controllers (#13585)

2020-05-03 16:30:36 +02:00

profile

Refactor Api::V1::ProfilesController into two separate controllers (#26573)

2023-08-21 15:47:09 +02:00

push

Fix Rails/ActionOrder cop (#24692)

2023-04-30 06:46:39 +02:00

statuses

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

2024-03-18 10:11:53 +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

Fix call to inefficient delete_matched cache method in domain blocks (#28374)

2023-12-18 16:14:43 +00:00

announcements_controller.rb

Autofix Rubocop Style/RedundantBegin (#23703)

2023-02-19 07:09:40 +09:00

annual_reports_controller.rb

Add annual reports for accounts (#28693)

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

apps_controller.rb

Add whitelist mode (#11291)

2019-07-30 11:10:46 +02:00

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

Fix /api/v1/custom_emojis being cached even when unauthenticated API access is disallowed (#24665)

2023-04-28 10:01:38 +02:00

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

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

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

featured_tags_controller.rb

Remove dead code in Api::V1::FeaturedTagsController (#25073)

2023-05-23 14:27:37 +02:00

filters_controller.rb

Fix Rails/ActionOrder cop (#24692)

2023-04-30 06:46:39 +02:00

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

Refactor: replace whitelist_mode mentions with limited_federation_mode (#26252)

2023-08-02 19:32:48 +02:00

invites_controller.rb

Add support for invite codes in the registration API (#27805)

2023-11-13 13:27:00 +00:00

lists_controller.rb

Add exclusive lists (#22048)

2023-06-05 09:37:02 +02:00

markers_controller.rb

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

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

media_controller.rb

Make it possible to upload audio and video to Heroku app (#24866)

2023-05-05 14:41:07 +02:00

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

Change unauthenticated responses to be cached in REST API (#24348)

2023-04-25 15:41:34 +02:00

preferences_controller.rb

Remove useless respond_to calls (#13208)

2020-03-06 01:29:38 +01:00

reports_controller.rb

Add forward_to_domains parameter to POST /api/v1/reports (#25866)

2023-07-10 18:26:56 +02:00

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

Fix potential redirection loop of streaming endpoint (#28665)

2024-01-10 15:05:46 +00:00

suggestions_controller.rb

Change algorithm of follow recommendations (#28314)

2023-12-19 10:59:43 +00:00

tags_controller.rb

Remove unfollowed hashtag posts from home feed (#26028)

2023-07-17 13:56:28 +02:00