Claire 48ec31bec8 Merge commit '4896d2c4c6d3bd6b878c5a075b6611c65d4203b2' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream changed stuff too close to glitch-soc's theming system changes.
  Applied upstream's changes.
- `streaming/index.js`:
  Upstream refactored a bunch of stuff where our code was different due to
  local-only posts.
  Applied upstream's changes while taking care of local-only posts.

2025-10-28 22:10:12 +01:00

..

accounts

Add default quote policy to API (#35948)

2025-08-29 11:37:20 +00:00

admin

Update rubocop to version 1.79.0 (#35502)

2025-07-25 07:22:05 +00:00

announcements

…

apps

Support multiple redirect_uris when creating OAuth 2.0 Applications (#29192)

2024-05-17 13:46:12 +00:00

domain_blocks

Add preview of followers removed in domain block modal in web UI (#32032)

2024-09-25 18:13:36 +00:00

emails

…

featured_tags

Extract constants for controller LIMIT queries (#32921)

2024-11-18 09:23:38 +00:00

instances

Fix missing terms of services link (#35115)

2025-06-21 08:59:47 +00:00

lists

Change lists to reflect added and removed users retroactively (#32930)

2024-11-19 10:04:12 +00:00

notifications

Fix notification requests from suspended accounts still being listed (#32354)

2024-10-09 17:29:02 +00:00

peers

Add LIMIT constant for api/v1/peers/search endpoint (#31989)

2024-09-20 08:31:58 +00:00

polls

Remove un-needed Poll.attached scope (#33368)

2024-12-20 15:15:11 +00:00

profile

Add delay to profile updates to debounce them (#34137)

2025-03-11 16:17:17 +00:00

push

Extract params hash for api/v1/push/subscriptions#create (#35475)

2025-07-24 07:49:20 +00:00

statuses

Change GET /api/v1/statuses/:id/quotes to allow listing quotes to other people's posts (#36291)

2025-09-30 09:56:03 +00:00

timelines

Merge commit '4dc21d7afdb485402555908bc72d071f8b25ec36' into glitch-soc/merge-upstream

2025-10-06 19:24:16 +02:00

trends

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

2025-03-25 19:59:59 +01:00

accounts_controller.rb

Assert usage of client credentials for account registration (#34828)

2025-05-28 12:09:32 +00:00

announcements_controller.rb

…

annual_reports_controller.rb

Add year in review feature to web UI (#32709)

2024-11-05 14:40:07 +00:00

apps_controller.rb

Support multiple redirect_uris when creating OAuth 2.0 Applications (#29192)

2024-05-17 13:46:12 +00:00

blocks_controller.rb

Move pagination_params into API::BaseController (#28845)

2024-05-30 14:56:48 +00:00

bookmarks_controller.rb

Move pagination_params into API::BaseController (#28845)

2024-05-30 14:56:48 +00:00

conversations_controller.rb

Move pagination_params into API::BaseController (#28845)

2024-05-30 14:56:48 +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 pagination_params into API::BaseController (#28845)

2024-05-30 14:56:48 +00:00

endorsements_controller.rb

Move pagination_params into API::BaseController (#28845)

2024-05-30 14:56:48 +00:00

favourites_controller.rb

Move pagination_params into API::BaseController (#28845)

2024-05-30 14:56:48 +00:00

featured_tags_controller.rb

Add REST API for featuring and unfeaturing a hashtag (#34489)

2025-04-25 15:12:05 +00:00

filters_controller.rb

Update rubocop to version 1.77.0 (#35128)

2025-06-23 07:40:11 +00:00

follow_requests_controller.rb

Drop support for ruby 3.1 (#32363)

2024-10-31 15:12:08 +00:00

followed_tags_controller.rb

Move pagination_params into API::BaseController (#28845)

2024-05-30 14:56:48 +00:00

instances_controller.rb

Add Deprecation headers on deprecated endpoints (#34262)

2025-03-25 12:30:10 +00:00

invites_controller.rb

Add coverage for api/v1/invites scenarios (#35389)

2025-07-21 14:17:53 +00:00

lists_controller.rb

Use enum validation instead of ArgumentError rescue for List replies policy check (#34452)

2025-04-14 21:11:10 +00: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

Add API to delete media attachments that are not in use (#33991)

2025-02-28 13:41:42 +00:00

mutes_controller.rb

Move pagination_params into API::BaseController (#28845)

2024-05-30 14:56:48 +00:00

notifications_controller.rb

Merge commit '598ae4f2da86029b1c3c3e35e64b89873037b598' into glitch-soc/merge-upstream

2024-07-30 20:47:34 +02:00

polls_controller.rb

Remove un-needed Poll.attached scope (#33368)

2024-12-20 15:15:11 +00:00

preferences_controller.rb

…

reports_controller.rb

Add optional OAuth application to reports (#30539)

2024-07-16 13:23:08 +00:00

scheduled_statuses_controller.rb

Merge pull request from GHSA-58x8-3qxw-6hm7

2024-07-04 16:26:49 +02:00

statuses_controller.rb

Merge commit '4896d2c4c6d3bd6b878c5a075b6611c65d4203b2' into glitch-soc/merge-upstream

2025-10-28 22:10:12 +01:00

streaming_controller.rb

Fix potential redirection loop of streaming endpoint (#28665)

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

suggestions_controller.rb

Fix incorrect deprecation warning for DELETE /api/v1/suggestions/:id (#34397)

2025-04-08 14:32:17 +00:00

tags_controller.rb

Add REST API for featuring and unfeaturing a hashtag (#34489)

2025-04-25 15:12:05 +00:00