Claire 82eebd0482 Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream ... Conflicts: - `app/serializers/initial_state_serializer.rb`: Upstream renamed an initial state parameter, where we had extra ones. Renamed as upstream did. - `app/workers/feed_insert_worker.rb`: Upstream wrapped database query in a block, we had extra database queries because of the DM timeline. Moved everything in the block.		2023-07-12 15:27:32 +02:00
..
accounts	…
admin	…
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 '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream	2023-07-12 15:27:32 +02:00
trends	…
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 500 error when a bookmark or favorite has been reported and deleted (#18174)	2022-04-28 23:34:58 +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	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	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	Autofix Rubocop Style/IfUnlessModifier (#23697)	2023-02-18 12:37:47 +01:00
featured_tags_controller.rb	…
filters_controller.rb	…
follow_requests_controller.rb	…
followed_tags_controller.rb	…
instances_controller.rb	Fix some user-independent endpoints potentially reading session cookies (#24650)	2023-04-25 22:14:44 +02:00
lists_controller.rb	…
markers_controller.rb	Use Rails' index_by where it makes sense (#15542)	2021-01-12 09:27:38 +01: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	…
notifications_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-25 14:00:40 +01:00
polls_controller.rb	…
preferences_controller.rb	…
reports_controller.rb	Fix report category not being saved in REST API (#17682)	2022-03-02 18:57:08 +01:00
scheduled_statuses_controller.rb	…
statuses_controller.rb	…
streaming_controller.rb	Add allow_other_host in redirects which may go outside app (#24252)	2023-03-26 00:38:32 +01:00
suggestions_controller.rb	Change auto-following admin-selected accounts, show in recommendations (#16078)	2021-04-24 17:01:43 +02:00
tags_controller.rb	…