diff options
author | Claire <claire.github-309c@sitedethib.com> | 2023-04-04 12:01:52 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-04 12:01:52 +0200 |
commit | af01ab7efebab356e73b498afe4258ae7515cc6a (patch) | |
tree | 798f5cde568987b7641543eb3972f355bae9170b /app/javascript/mastodon/performance.js | |
parent | 8192b0da7cd1fac38a68eab6746fc7ec74328a77 (diff) | |
parent | d29cf8a044f6c0d004649223e018d240983e8437 (diff) |
Merge pull request #2159 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/mastodon/performance.js')
-rw-r--r-- | app/javascript/mastodon/performance.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/performance.js b/app/javascript/mastodon/performance.js index 2b7e1bda8..95cf962d6 100644 --- a/app/javascript/mastodon/performance.js +++ b/app/javascript/mastodon/performance.js @@ -12,7 +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'); |