Christian Schmidt ae5af957a1 Merge branch 'main' into search-warnings ... # Conflicts: # app/javascript/mastodon/features/compose/components/search.jsx # app/javascript/mastodon/features/explore/components/search_section.jsx		2024-12-20 17:03:36 +01:00
..
chewy	Clamp dates when serializing to Elasticsearch API (#28081)	2023-11-27 13:25:54 +00:00
controllers	Remove un-needed Poll.attached scope (#33368)	2024-12-20 15:15:11 +00:00
helpers	Add terms of service (#33055)	2024-12-09 10:04:46 +00:00
javascript	Merge branch 'main' into search-warnings	2024-12-20 17:03:36 +01:00
lib	Fix featured tags for remote accounts not being kept up to date (#33372)	2024-12-20 11:50:31 +00:00
mailers	Add terms of service (#33055)	2024-12-09 10:04:46 +00:00
models	Remove un-needed Poll.attached scope (#33368)	2024-12-20 15:15:11 +00:00
policies	Add terms of service (#33055)	2024-12-09 10:04:46 +00:00
presenters	Update dependency doorkeeper to v5.8.0 (#33000)	2024-11-21 13:48:30 +00:00
serializers	Fix application_id erroneous inclusion in ScheduledStatusSerializer (#33159)	2024-12-17 08:54:07 +00:00
services	Fix featured tags for remote accounts not being kept up to date (#33372)	2024-12-20 11:50:31 +00:00
validators	Update rubocop to version 1.69.1 (#32967)	2024-12-09 14:52:49 +00:00
views	Remove app/views rubocop rule exception for haml-lint (#33270)	2024-12-11 15:50:56 +00:00
workers	Fix processing of mentions for post edits with an existing corresponding silent mention (#33227)	2024-12-11 12:59:29 +00:00