Claire d099de23c5 Merge commit 'bf32befcc21831b31f684795bb211b2f1f4cfb6d' into glitch-soc/merge-upstream ...

Conflicts:
- `app/models/status.rb`:
  Upstream reordered model annotations, while glitch-soc has extra columns.
  Reordered as upstream did.
- `app/models/status_edit.rb`:
  Upstream reordered model annotations, while glitch-soc has extra columns.
  Reordered as upstream did.

2026-03-12 19:01:28 +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 '1d46558e8d949860acc4f3a86516b9989bd74f79' into glitch-soc/merge-upstream

2026-03-09 18:14:15 +01:00

helpers

Fix linting issue

2026-03-02 18:59:32 +01:00

inputs

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

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

javascript

[Glitch] Profile editing: Edit image menu

2026-03-12 18:53:39 +01:00

lib

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

2026-03-12 18:48:32 +01:00

mailers

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

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

models

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

2026-03-12 19:01:28 +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 '811575a10903cada549580979cc809ca98ad570c' into glitch-soc/merge-upstream

2026-03-11 18:50:59 +01:00

services

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

2026-03-12 18:48:32 +01:00

validators

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

2026-03-07 17:29:09 +01:00

views

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

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

workers

Merge commit '811575a10903cada549580979cc809ca98ad570c' into glitch-soc/merge-upstream

2026-03-11 18:50:59 +01:00