Claire d5b959a2ca Merge commit '75fca715e9ae8ad347edbaf6511a052f161a3de3' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream moved some preferences to a new category, while glitch-soc had an
  extra preference there.
  Moved the extra preference like upstream did to the new category.

2025-09-02 19:07:51 +02:00

..

exports

…

migration

Use moved? query method where relevant (#35542)

2025-07-28 08:02:21 +00:00

preferences

Move posting defaults to their own preferences sub-category (#35966)

2025-09-01 08:31:07 +00:00

two_factor_authentication

Replace unprocessable_entity -> unprocessable_content (#35658)

2025-08-05 07:42:08 +00:00

aliases_controller.rb

…

applications_controller.rb

…

base_controller.rb

…

deletes_controller.rb

…

exports_controller.rb

…

featured_tags_controller.rb

…

flavours_controller.rb

…

imports_controller.rb

…

login_activities_controller.rb

…

migrations_controller.rb

…

pictures_controller.rb

…

privacy_controller.rb

…

profiles_controller.rb

…

sessions_controller.rb

Set flash options via redirect where possible (#35370)

2025-07-24 08:03:28 +00:00

two_factor_authentication_methods_controller.rb

…

verifications_controller.rb

…