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

..

aliases

Use material symbols in table link helper (#31359)

2024-08-20 11:48:15 +00:00

applications

Clean up labels on development application form (#32116)

2024-10-02 14:45:12 +00:00

deletes

Fix style for hashes (#20518)

2022-11-17 11:05:39 +01:00

exports

Fix recently-broken admin interface buttons (#32240)

2024-10-03 16:12:15 +00:00

featured_tags

Revamp heading levels in settings & admin pages (#38230)

2026-03-17 10:32:24 +00:00

flavours

Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream

2024-01-17 18:32:15 +01:00

imports

Implement CSS theme tokens behind feature flag (#36861)

2025-11-17 09:44:55 +00:00

login_activities

Replace more font-awesome icons in views/settings (#30963)

2024-08-07 22:52:35 +00:00

migration/redirects

Fix LineLength haml-lint in app/views/settings area (#28663)

2024-01-09 15:28:56 +00:00

migrations

Improve account migration warnings (#20387)

2025-11-05 15:27:40 +00:00

preferences

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

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

privacy

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

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

profiles

Revamp heading levels in settings & admin pages (#38230)

2026-03-17 10:32:24 +00:00

shared

Move "Privacy and reach" from "Public profile" to top-level navigation (#27294)

2025-11-03 17:56:17 +00:00

two_factor_authentication

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

2026-02-11 20:26:56 +01:00

two_factor_authentication_methods

Add ability to require 2FA for specific roles (including Everybody) (#37701)

2026-02-11 14:34:09 +00:00

verifications

Revamp heading levels in settings & admin pages (#38230)

2026-03-17 10:32:24 +00:00