Claire deed31ba8c Merge commit '1ba579b0a181fbfff514ef32b50179d2ab1fc342' into glitch-soc/merge-upstream ...

Conflicts:
- `app/models/public_feed.rb`:
  Minor conflict due to glitch-soc's local-only posts.
  Adopted upstream's changes.
- `spec/models/tag_feed_spec.rb`:
  Minor conflict due to glitch-soc's local-only posts.
  Adopted upstream's changes.

2025-10-23 18:33:52 +02:00

..

chewy

Change account search to be more forgiving of spaces (#34455)

2025-04-25 10:35:21 +00:00

controllers

Merge commit '5a8ab0a3e62a8825e28bb74c1760ba6488d20c97' into glitch-soc/merge-upstream

2025-10-15 16:35:37 +02:00

helpers

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

2025-10-17 18:36:27 +02:00

inputs

Add age verification on sign-up (#34150)

2025-03-14 14:07:29 +00:00

javascript

Merge commit '1ba579b0a181fbfff514ef32b50179d2ab1fc342' into glitch-soc/merge-upstream

2025-10-23 18:33:52 +02:00

lib

Merge commit '118ff13bd028cfb19370a12edb9307ea96007ad7' into glitch-soc/merge-upstream

2025-10-21 15:57:43 +02:00

mailers

Add missing mailer for quote notifications (#35652)

2025-08-04 10:44:59 +00:00

models

Merge commit '1ba579b0a181fbfff514ef32b50179d2ab1fc342' into glitch-soc/merge-upstream

2025-10-23 18:33:52 +02:00

policies

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

2025-10-01 19:13:18 +02:00

presenters

Rework FEP-7888 implementation (#36064)

2025-09-09 18:27:30 +00:00

serializers

Merge commit '17eb1a7e668dbba6e79612395b99407e8e8de6b9' into glitch-soc/merge-upstream

2025-10-21 18:15:56 +02:00

services

Merge commit '118ff13bd028cfb19370a12edb9307ea96007ad7' into glitch-soc/merge-upstream

2025-10-21 15:57:43 +02:00

validators

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

2025-07-30 20:05:45 +02:00

views

Merge commit '612771de465da60dbd58790adc6b1556a7fa739b' into glitch-soc/merge-upstream

2025-10-17 19:00:18 +02:00

workers

Merge commit '17eb1a7e668dbba6e79612395b99407e8e8de6b9' into glitch-soc/merge-upstream

2025-10-21 18:15:56 +02:00