Merge branch 'master' into glitch-soc/merge-upstream

app/javascript/mastodon/components/status.js

@@ -171,6 +171,11 @@ class Status extends ImmutablePureComponent {
   }
 
   handleExpandClick = (e) => {
+    if (this.props.onClick) {
+      this.props.onClick();
+      return;
+    }
+
     if (e.button === 0) {
       if (!this.context.router) {
         return;

app/views/settings/preferences/other/show.html.haml

@@ -1,7 +1,7 @@
 - content_for :page_title do
   = t('settings.preferences')
 
-= simple_form_for current_user, url: settings_preferences_path, html: { method: :put } do |f|
+= simple_form_for current_user, url: settings_preferences_other_path, html: { method: :put } do |f|
   = render 'shared/error_messages', object: current_user
 
   .fields-group