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

Merge commit '899eac1a92c802c334606a49d538ef37bd47c91a' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `app/javascript/packs/admin.jsx`:
  Changes split in `app/javascript/core/admin.js` and `app/javascript/flavours/glitch/packs/admin.jsx`.
This commit is contained in:
Claire
2024-02-28 20:10:01 +01:00
parent c19787f3f4 899eac1a92
commit c2f0ea415e
10 changed files with 43 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/packs/admin.jsx
View File

@@ -4,7 +4,7 @@ import { createRoot } from 'react-dom/client';
import ready from '../mastodon/ready';
ready(() => {
[].forEach.call(document.querySelectorAll('[data-admin-component]'), element => {
document.querySelectorAll('[data-admin-component]').forEach(element => {
const componentName = element.getAttribute('data-admin-component');
const componentProps = JSON.parse(element.getAttribute('data-props'));