Merge commit 'e93a75f1a11d6dfdcbd39dbdc22526c5508ad881' into glitch-soc/merge-upstream

Conflicts and ported changes:
- updated `@rails/ujs` imports

app/javascript/core/admin.js

@@ -1,7 +1,7 @@
 //  This file will be loaded on admin pages, regardless of theme.
 
 import 'packs/public-path';
-import { delegate } from '@rails/ujs';
+import delegate from '@rails/ujs';
 
 import ready from '../mastodon/ready';
 

app/javascript/core/settings.js

@@ -1,7 +1,7 @@
 //  This file will be loaded on settings pages, regardless of theme.
 
 import 'packs/public-path';
-import { delegate } from '@rails/ujs';
+import delegate from '@rails/ujs';
 
 delegate(document, '#edit_profile input[type=file]', 'change', ({ target }) => {
   const avatar = document.getElementById(target.id + '-preview');

app/javascript/flavours/glitch/packs/common.js

@@ -1,5 +1,5 @@
 import 'packs/public-path';
-import { start } from '@rails/ujs';
+import start from '@rails/ujs';
 import 'flavours/glitch/styles/index.scss';
 
 start();

app/javascript/flavours/glitch/packs/public.jsx

@@ -4,7 +4,7 @@ import { createRoot }  from 'react-dom/client';
 import { IntlMessageFormat } from 'intl-messageformat';
 import { defineMessages } from 'react-intl';
 
-import { delegate }  from '@rails/ujs';
+import delegate from '@rails/ujs';
 import axios from 'axios';
 import { createBrowserHistory }  from 'history';
 import { throttle } from 'lodash';

app/javascript/flavours/glitch/packs/settings.js

@@ -1,5 +1,5 @@
 import 'packs/public-path';
-import { delegate }  from '@rails/ujs';
+import delegate from '@rails/ujs';
 
 import loadKeyboardExtensions from 'flavours/glitch/load_keyboard_extensions';
 import { loadPolyfills } from 'flavours/glitch/polyfills';

app/javascript/packs/public.jsx

@@ -5,7 +5,7 @@ import { createRoot }  from 'react-dom/client';
 import { IntlMessageFormat }  from 'intl-messageformat';
 import { defineMessages } from 'react-intl';
 
-import { delegate }  from '@rails/ujs';
+import delegate from '@rails/ujs';
 import axios from 'axios';
 import { throttle } from 'lodash';