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

Conflicts:
- config/routes.rb
  Upstream changed some admin routes, conflict was because of an added :show
  action for statuses on our side. Kept it.

app/javascript/styles/mailer.scss

@@ -426,6 +426,10 @@ h5 {
     background: $success-green;
   }
 
+  &.alert-icon td {
+    background: $error-red;
+  }
+
   img {
     max-width: 32px;
     width: 32px;

app/javascript/styles/mastodon/admin.scss

@@ -542,6 +542,10 @@ a.name-tag,
     border-left-color: lighten($error-red, 12%);
   }
 
+  &.warning {
+    border-left-color: $gold-star;
+  }
+
   &__bubble {
     padding: 16px;
     padding-left: 14px;