mirror/blueb-Chuckya-fe-standalone
1
0
Fork 0
mirror of https://iceshrimp.dev/blueb/Chuckya-fe-standalone.git synced 2026-01-11 05:23:14 -08:00
Code Issues Projects Releases Packages Wiki Activity

Merge commit '3f6887557b' into glitch-soc/merge-upstream

Browse source 
Conflicts:
- `app/javascript/entrypoints/common.js`:
  Upstream moved everything from `app/javascript/packs` to
  `app/javascript/entrypoints` while this file was a glitch-soc
  addition. Moved it like the rest.
- `tsconfig.json`:
  Conflict due to glitch-soc's flavor.
  Updated like upstream.

Also moved and updated the following files accordingly:
- `app/javascript/flavours/vanilla/theme.yml`
- `app/javascript/flavours/glitch/theme.yml`
- everything in `app/javascript/flavours/glitch/packs`
This commit is contained in:
Claire 2024-05-04 14:59:00 +02:00
commit bceb45adda
60 changed files with 92 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tsconfig.json
View file

@ -25,9 +25,8 @@
},
"include": [
"app/javascript/mastodon",
"app/javascript/packs",
"app/javascript/entrypoints",
"app/javascript/types",
"app/javascript/flavours/glitch",
"app/javascript/core"
"app/javascript/flavours/glitch"
]
}