This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Claire 2d09653d50 Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/application_controller.rb: Upstream added an `include` where we had an extra `include` due to glitch-soc's theming system. Added upstream's new `include`.		2023-07-13 13:35:15 +02:00
..
accounts	…
admin	Fix POST `/api/v1/admin/domain_allows` returning 200 when no domain is specified (#24958)	2023-05-22 13:44:49 +02:00
announcements	…
apps	…
crypto	…
emails	Fix HTTP 500 in `/api/v1/emails/check_confirmation` (#25595)	2023-07-02 00:05:44 +02:00
featured_tags	…
instances	…
lists	…
polls	…
push	…
statuses	Change /api/v1/statuses/:id/history to always return at least one item (#25510)	2023-06-22 14:56:14 +02:00
timelines	Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream	2023-07-13 13:35:15 +02:00
trends	Merge branch 'main' into glitch-soc/merge-upstream	2023-04-29 10:44:56 +02:00
accounts_controller.rb	Add time zone preference (#25342)	2023-06-10 03:29:37 +02:00
announcements_controller.rb	…
apps_controller.rb	…
blocks_controller.rb	…
bookmarks_controller.rb	Fix `Naming/MemoizedInstanceVariableName` cop (#25928)	2023-07-12 10:08:51 +02:00
conversations_controller.rb	Add POST /api/v1/conversations/:id/unread (#25509)	2023-06-22 18:46:43 +02:00
custom_emojis_controller.rb	…
directories_controller.rb	Fix rails `rewhere` deprecation warning in directories api controller (#25625)	2023-07-01 21:48:16 +02:00
domain_blocks_controller.rb	…
endorsements_controller.rb	…
favourites_controller.rb	Fix `Naming/MemoizedInstanceVariableName` cop (#25928)	2023-07-12 10:08:51 +02:00
featured_tags_controller.rb	Remove dead code in Api::V1::FeaturedTagsController (#25073)	2023-05-23 14:27:37 +02:00
filters_controller.rb	…
follow_requests_controller.rb	…
followed_tags_controller.rb	…
instances_controller.rb	…
lists_controller.rb	Add exclusive lists (#22048)	2023-06-05 09:37:02 +02:00
markers_controller.rb	Change markers API to use a replica (#25851)	2023-07-12 18:57:40 +02:00
media_controller.rb	…
mutes_controller.rb	…
notifications_controller.rb	Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream	2023-07-13 13:35:15 +02:00
polls_controller.rb	…
preferences_controller.rb	…
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	…
statuses_controller.rb	…
streaming_controller.rb	…
suggestions_controller.rb	…
tags_controller.rb	…