Claire 0cec9077a4 Merge commit 'edeae945c0c9d6318d489ab720587621545063d0' into glitch-soc/merge-upstream ... Conflicts: - `spec/requests/api/v2/instance_spec.rb`: Upstream added a test for a new attribute, next to a line we modified in glitch-soc because of a different default value. Updated as upstream's did, keeping glitch-soc's default value.		2024-08-21 18:44:21 +02:00
..
chewy	Clamp dates when serializing to Elasticsearch API (#28081)	2023-11-27 13:25:54 +00:00
controllers	Merge commit '53c183f899b5382f1eebd72e34a090c30f8eba6a' into glitch-soc/merge-upstream	2024-08-19 18:25:31 +02:00
helpers	Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream	2024-08-20 18:31:50 +02:00
javascript	Merge commit 'edeae945c0c9d6318d489ab720587621545063d0' into glitch-soc/merge-upstream	2024-08-21 18:44:21 +02:00
lib	Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream	2024-08-20 18:31:50 +02:00
mailers	Remove duplicate method def ApplicationHelper#instance_presenter (#30331)	2024-05-17 08:29:13 +00:00
models	Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream	2024-08-20 18:31:50 +02:00
policies	Merge commit 'de4815afda0809bf999519aabda1cd14c67278da' into glitch-soc/merge-upstream	2024-05-20 12:17:36 +02:00
presenters	Add option to request partial accounts in grouped notifications API (#31299)	2024-08-06 12:09:35 +00:00
serializers	Merge commit 'edeae945c0c9d6318d489ab720587621545063d0' into glitch-soc/merge-upstream	2024-08-21 18:44:21 +02:00
services	Merge commit '53c183f899b5382f1eebd72e34a090c30f8eba6a' into glitch-soc/merge-upstream	2024-08-19 18:25:31 +02:00
validators	Merge commit 'a1ddaa9ee96ab1d05f4e37f3472b0418e0d5628e' into glitch-soc/merge-upstream	2024-08-14 21:17:43 +02:00
views	Merge commit 'edeae945c0c9d6318d489ab720587621545063d0' into glitch-soc/merge-upstream	2024-08-21 18:44:21 +02:00
workers	Merge commit '53c183f899b5382f1eebd72e34a090c30f8eba6a' into glitch-soc/merge-upstream	2024-08-19 18:25:31 +02:00