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

Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
  Conflict due to glitch-soc having to take care of local-only
  pinned toots in that controller.
  Took upstream's changes and restored the local-only special
  handling.
- `app/controllers/auth/sessions_controller.rb`:
  Minor conflicts due to the theming system, applied upstream
  changes, adapted the following two files for glitch-soc's
  theming system:
  - `app/controllers/concerns/sign_in_token_authentication_concern.rb`
  - `app/controllers/concerns/two_factor_authentication_concern.rb`
- `app/services/backup_service.rb`:
  Minor conflict due to glitch-soc having to handle local-only
  toots specially. Applied upstream changes and restored
  the local-only special handling.
- `app/views/admin/custom_emojis/index.html.haml`:
  Minor conflict due to the theming system.
- `package.json`:
  Upstream dependency updated, too close to a glitch-soc-only
  dependency in the file.
- `yarn.lock`:
  Upstream dependency updated, too close to a glitch-soc-only
  dependency in the file.

1 files changed, 35 insertions, 0 deletions

diff --git a/public/emoji/1f3ae_border.svg b/public/emoji/1f3ae_border.svg
new file mode 100644
index 000000000..4a17797b1
--- /dev/null
+++ b/public/emoji/1f3ae_border.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40">
+  <g>
+    <path d="M2.13 14.856l-.004-.002S.075 27.271.075 29.061c0 1.824 1.343 3.302 3 3.302.68 0 1.3-.258 1.803-.678l10.166-8.938L2.13 14.856zm31.69 0l.004-.002s2.051 12.417 2.051 14.207c0 1.824-1.343 3.302-3 3.302-.68 0-1.3-.258-1.803-.678l-10.166-8.938 12.914-7.891z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <g stroke="white" stroke-linejoin="round" stroke-width="4px">
+      <circle cx="25.975" cy="15.551" r="8.5"/>
+      <circle cx="9.975" cy="15.551" r="8.5"/>
+      <path d="M9.975 7.051h16v16.87h-16z"/>
+    </g>
+    <circle cx="13.075" cy="23.301" r="5" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <circle cx="22.875" cy="23.301" r="5" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <circle cx="22.875" cy="23.301" r="3" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <circle cx="13.075" cy="23.301" r="3" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <circle cx="25.735" cy="11.133" r="1.603" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <circle cx="25.735" cy="17.607" r="1.603" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <circle cx="22.498" cy="14.37" r="1.603" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <circle cx="28.972" cy="14.37" r="1.603" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+    <path d="M11.148 12.514v-2.168c0-.279-.226-.505-.505-.505H9.085c-.279 0-.505.226-.505.505v2.168l1.284 1.285 1.284-1.285zm-2.569 3.63v2.168c0 .279.226.505.505.505h1.558c.279 0 .505-.226.505-.505v-2.168l-1.284-1.285-1.284 1.285zm5.269-3.1H11.68l-1.285 1.285 1.285 1.285h2.168c.279 0 .505-.227.505-.505V13.55c0-.279-.226-.506-.505-.506zm-5.799 0H5.88c-.279 0-.505.227-.505.505v1.558c0 .279.226.505.505.505h2.168l1.285-1.285-1.284-1.283z" stroke="white" stroke-linejoin="round" stroke-width="4px"/>
+  </g>
+  <path fill="#31373D" d="M2.13 14.856l-.004-.002S.075 27.271.075 29.061c0 1.824 1.343 3.302 3 3.302.68 0 1.3-.258 1.803-.678l10.166-8.938L2.13 14.856zm31.69 0l.004-.002s2.051 12.417 2.051 14.207c0 1.824-1.343 3.302-3 3.302-.68 0-1.3-.258-1.803-.678l-10.166-8.938 12.914-7.891z"/>
+  <g fill="#14171A">
+    <circle cx="25.975" cy="15.551" r="8.5"/>
+    <circle cx="9.975" cy="15.551" r="8.5"/>
+    <path d="M9.975 7.051h16v16.87h-16z"/>
+  </g>
+  <circle fill="#14171A" cx="13.075" cy="23.301" r="5"/>
+  <circle fill="#14171A" cx="22.875" cy="23.301" r="5"/>
+  <circle fill="#67757F" cx="22.875" cy="23.301" r="3"/>
+  <circle fill="#67757F" cx="13.075" cy="23.301" r="3"/>
+  <circle fill="#FFCC4D" cx="25.735" cy="11.133" r="1.603"/>
+  <circle fill="#77B255" cx="25.735" cy="17.607" r="1.603"/>
+  <circle fill="#50A5E6" cx="22.498" cy="14.37" r="1.603"/>
+  <circle fill="#DD2E44" cx="28.972" cy="14.37" r="1.603"/>
+  <path d="M11.148 12.514v-2.168c0-.279-.226-.505-.505-.505H9.085c-.279 0-.505.226-.505.505v2.168l1.284 1.285 1.284-1.285zm-2.569 3.63v2.168c0 .279.226.505.505.505h1.558c.279 0 .505-.226.505-.505v-2.168l-1.284-1.285-1.284 1.285zm5.269-3.1H11.68l-1.285 1.285 1.285 1.285h2.168c.279 0 .505-.227.505-.505V13.55c0-.279-.226-.506-.505-.506zm-5.799 0H5.88c-.279 0-.505.227-.505.505v1.558c0 .279.226.505.505.505h2.168l1.285-1.285-1.284-1.283z" fill="#8899A6"/>
+</svg>