Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream

2023-05-25 22:59:30 +02:00
parent ad1098970b 4a22e72b9b
commit 2e02d03524
48 changed files with 1232 additions and 160 deletions
--- a/jest.config.js
+++ b/jest.config.js
@@ -10,7 +10,6 @@ const config = {
    '<rootDir>/tmp/',
    '<rootDir>/app/javascript/themes/',
  ],
-  setupFiles: ['raf/polyfill'],
  setupFilesAfterEnv: ['<rootDir>/app/javascript/mastodon/test_setup.js'],
  collectCoverageFrom: [
    'app/javascript/mastodon/**/*.{js,jsx,ts,tsx}',