about summary refs log tree commit diff
path: root/app/javascript/mastodon/performance.js
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2023-04-03 17:21:33 +0200
committerGitHub <noreply@github.com>2023-04-03 17:21:33 +0200
commit8192b0da7cd1fac38a68eab6746fc7ec74328a77 (patch)
tree686c30ed5f6c4cfe5f6b4d84e46ff19f7baa6949 /app/javascript/mastodon/performance.js
parentcbdb25ab0343603165fc89fd28b07c9ca0f2ae6d (diff)
parent7b15f4006adb5f8f04d83174532c30eeb78757b0 (diff)
Merge pull request #2155 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/mastodon/performance.js')
-rw-r--r--app/javascript/mastodon/performance.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/javascript/mastodon/performance.js b/app/javascript/mastodon/performance.js
index 450a90626..2b7e1bda8 100644
--- a/app/javascript/mastodon/performance.js
+++ b/app/javascript/mastodon/performance.js
@@ -12,6 +12,7 @@ if (process.env.NODE_ENV === 'development') {
     // See: https://bugzilla.mozilla.org/show_bug.cgi?id=1331135
     performance.setResourceTimingBufferSize(Infinity);
   }
+  // eslint-disable-next-line import/no-extraneous-dependencies
   marky = require('marky');
   // allows us to easily do e.g. ReactPerf.printWasted() while debugging
   //window.ReactPerf = require('react-addons-perf');