Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-14 00:08:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts and ported changes:
- updated `@rails/ujs` imports
This commit is contained in:
Claire
2023-10-24 19:59:19 +02:00
parent e25cc4deb7 e93a75f1a1
commit 4b0fb764c3
17 changed files with 126 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/core/admin.js
View File

@@ -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';