Claire bd9e7d6060 Merge commit '68984de5b503791b814d81a85520af256bf43e11' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/admin/settings/discovery/show.html.haml`:
  Glitch-soc has an extra setting textually adjacent to a line upstream has changed.
  Applied upstream's change while keeping glitch-soc's setting.

2026-03-17 18:53:00 +01:00

..

chewy

Upgrade rubocop from v1.84.0 to v1.84.2, update config, and correct offences (#37795)

2026-02-17 14:56:46 +00:00

controllers

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

2026-03-17 18:01:07 +01:00

helpers

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

2026-03-17 18:01:07 +01:00

inputs

Rely on locale for options order in DOB input (#36895)

2025-12-05 15:21:22 +00:00

javascript

Merge commit '68984de5b503791b814d81a85520af256bf43e11' into glitch-soc/merge-upstream

2026-03-17 18:53:00 +01:00

lib

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

2026-03-17 18:01:07 +01:00

mailers

Remove unused @markdown from user mailer terms action (#38160)

2026-03-12 09:22:56 +00:00

models

Merge commit '16c41e035bdd6e08927c950aeeb5332adbe8b6d5' into glitch-soc/merge-upstream

2026-03-16 18:16:56 +01:00

policies

Merge commit '74b3b6c798d1f137947e80df8eefb7412e70febd' into glitch-soc/merge-upstream

2026-03-02 18:11:45 +01:00

presenters

Fix Style/ReduceToHash cop (#38088)

2026-03-09 10:01:12 +00:00

serializers

Merge commit '377952703cf70f14008cc7938479558d8cca9903' into glitch-soc/merge-upstream

2026-03-12 19:03:08 +01:00

services

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

2026-03-17 18:01:07 +01:00

validators

Merge commit '16c41e035bdd6e08927c950aeeb5332adbe8b6d5' into glitch-soc/merge-upstream

2026-03-16 18:16:56 +01:00

views

Merge commit '68984de5b503791b814d81a85520af256bf43e11' into glitch-soc/merge-upstream

2026-03-17 18:53:00 +01:00

workers

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

2026-03-17 18:01:07 +01:00