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.

app/controllers/settings/preferences/posting_defaults_controller.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class Settings::Preferences::PostingDefaultsController < Settings::Preferences::BaseController
+  private
+
+  def after_update_redirect_path
+    settings_preferences_posting_defaults_path
+  end
+end