From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 29 Sep 2021 22:01:20 +0000 (+0200)
Subject: Merge branch 'main' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=29b5c5f4830f9bda0af352b1d6ac73830a6cfd4e;p=mastodon.git

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

Conflicts:
- `app/models/custom_emoji.rb`:
  Slight refactor upstream, next to a line that was different in glitch-soc
  because of our local configurable limits on custom emoji size.
  Ported upstream changes.
- `yarn.lock`:
  Not really a conflict, upstream dependency textually too close to a
  glitch-soc-only dependency.
  Updated upstream dependency as upstream.
---

29b5c5f4830f9bda0af352b1d6ac73830a6cfd4e
diff --cc app/models/custom_emoji.rb
index f14357932,a85feb73a..d7349dc6a
--- a/app/models/custom_emoji.rb
+++ b/app/models/custom_emoji.rb
@@@ -21,8 -21,9 +21,10 @@@
  #
  
  class CustomEmoji < ApplicationRecord
+   include Attachmentable
+ 
 -  LIMIT = 50.kilobytes
 +  LOCAL_LIMIT = (ENV['MAX_EMOJI_SIZE'] || 50.kilobytes).to_i
 +  LIMIT       = [LOCAL_LIMIT, (ENV['MAX_REMOTE_EMOJI_SIZE'] || 200.kilobytes).to_i].max
  
    SHORTCODE_RE_FRAGMENT = '[a-zA-Z0-9_]{2,}'
  
diff --cc package.json
index e5a004d81,a7782e112..1cfd192d1
--- a/package.json
+++ b/package.json
@@@ -72,9 -71,8 +72,9 @@@
      "@github/webauthn-json": "^0.5.7",
      "@rails/ujs": "^6.1.4",
      "array-includes": "^3.1.3",
 +    "atrament": "0.2.4",
      "arrow-key-navigation": "^1.2.0",
-     "autoprefixer": "^9.8.6",
+     "autoprefixer": "^9.8.7",
      "axios": "^0.21.4",
      "babel-loader": "^8.2.2",
      "babel-plugin-lodash": "^3.3.4",
@@@ -96,10 -94,9 +96,10 @@@
      "escape-html": "^1.0.3",
      "exif-js": "^2.3.0",
      "express": "^4.17.1",
 +    "favico.js": "^0.3.10",
      "file-loader": "^6.2.0",
      "font-awesome": "^4.7.0",
-     "glob": "^7.1.7",
+     "glob": "^7.2.0",
      "history": "^4.10.1",
      "http-link-header": "^1.0.3",
      "immutable": "^3.8.2",
diff --cc yarn.lock
index f842c2eac,8a8ab3a86..eae6357db
--- a/yarn.lock
+++ b/yarn.lock
@@@ -2263,15 -2263,10 +2263,15 @@@ atob@^2.1.2
    resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
    integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
  
 +atrament@0.2.4:
 +  version "0.2.4"
 +  resolved "https://registry.yarnpkg.com/atrament/-/atrament-0.2.4.tgz#6f78196edfcd194e568b7c0b9c88201ec371ac66"
 +  integrity sha512-hSA9VwW6COMwvRhSEO4uZweZ91YGOdHqwvslNyrJZG+8mzc4qx/qMsDZBuAeXFeWZO/QKtRjIXguOUy1aNMl3A==
 +
- autoprefixer@^9.8.6:
-   version "9.8.6"
-   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz#3b73594ca1bf9266320c5acf1588d74dea74210f"
-   integrity sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==
+ autoprefixer@^9.8.7:
+   version "9.8.7"
+   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.7.tgz#e3c12de18a800af1a1a8155fbc01dc7de29ea184"
+   integrity sha512-7Hg99B1eTH5+LgmUBUSmov1Z3bsggQJS7v3IMGo6wcScnbRuvtMc871J9J+4bSbIqa9LSX/zypFXJ8sXHpMJeQ==
    dependencies:
      browserslist "^4.12.0"
      caniuse-lite "^1.0.30001109"