mirror of
https://github.com/iflytek/skillhub.git
synced 2026-10-09 03:17:52 +00:00
a6cf862e8e
Resolved 9 conflicts according to documented strategy: - .gitignore: kept both entries (docs/review/ + CLAUDE.md) - ClawHubCompatController.java: manual merge (use @AuthenticationPrincipal + platformRoles) - ClawHubCompatControllerTest.java: kept ours (HEAD security tests) - CliControllerTest.java: kept ours (HEAD platform roles tests) - ReviewPermissionChecker.java: kept ours (stricter permission model) - SkillPublishService.java: kept theirs (main SUPER_ADMIN bypass + events) - SkillPublishServiceTest.java: kept theirs (main complete test suite) - router.tsx: manual merge (HEAD's createLazyRouteComponent + main's privacy/terms) - markdown-renderer.tsx: kept ours (HEAD frontmatter stripping + styles) All A1-A9 security fixes preserved. No new logic introduced.
71 lines
759 B
Text
71 lines
759 B
Text
# OS files
|
|
.DS_Store
|
|
Thumbs.db
|
|
|
|
# Editors / IDEs
|
|
.idea/
|
|
.vscode/
|
|
.claude/
|
|
*.iml
|
|
*.swp
|
|
*.swo
|
|
.classpath
|
|
.project
|
|
.settings/
|
|
|
|
# Logs
|
|
*.log
|
|
logs/
|
|
npm-debug.log*
|
|
yarn-debug.log*
|
|
yarn-error.log*
|
|
pnpm-debug.log*
|
|
|
|
# Environment / local config
|
|
.env
|
|
.env.*
|
|
!.env.example
|
|
!.env.*.example
|
|
|
|
# Java / Spring Boot
|
|
target/
|
|
build/
|
|
.gradle/
|
|
out/
|
|
*.class
|
|
*.jar
|
|
*.war
|
|
*.ear
|
|
|
|
# Keep wrapper binaries/config in VCS
|
|
!gradle/wrapper/gradle-wrapper.jar
|
|
!mvnw
|
|
!mvnw.cmd
|
|
|
|
# React / frontend
|
|
node_modules/
|
|
dist/
|
|
coverage/
|
|
.cache/
|
|
.parcel-cache/
|
|
.vite/
|
|
.eslintcache
|
|
*.tsbuildinfo
|
|
package-lock.json
|
|
|
|
# Temporary files
|
|
.tmp/
|
|
tmp/
|
|
__pycache__/
|
|
*.py[cod]
|
|
|
|
# Git worktrees
|
|
.worktrees/
|
|
|
|
# Local dev runtime
|
|
.dev/
|
|
|
|
# Superpowers (AI planning artifacts)
|
|
docs/superpowers/
|
|
docs/review/
|
|
CLAUDE.md
|