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

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

Browse Source 
Conflicts:
- `tsconfig.json`:
  glitch-soc had extra paths under `app/javascript/flavours`, but upstream
  added `app/javascript` as a whole, so updated to upstream's.
This commit is contained in:
Claire
2025-06-25 19:29:09 +02:00
parent fa9318083e dbb20f76a7
commit c9a1e27a49
91 changed files with 1108 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
eslint.config.mjs
View File

@@ -270,8 +270,7 @@ export default tseslint.config([
devDependencies: [
'eslint.config.mjs',
'app/javascript/mastodon/performance.js',
'app/javascript/mastodon/test_setup.js',
'app/javascript/mastodon/test_helpers.tsx',
'app/javascript/testing/**/*',
'app/javascript/**/__tests__/**',
'app/javascript/**/*.stories.ts',
'app/javascript/**/*.stories.tsx',