Skip to content

Commit 6aa9261

Browse files
merge: resolve conflicts with origin/dev
Co-authored-by: onerandomdevv <231661599+onerandomdevv@users.noreply.github.com>
2 parents fd1cee1 + 806d8b1 commit 6aa9261

68 files changed

Lines changed: 3362 additions & 1559 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/pull_request_template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
- [ ] Docs
1010

1111
## Checklist
12-
- [ ] I have read CLAUDE.md
12+
- [ ] I have read AGENTS.md
1313
- [ ] pnpm build passes locally with no errors
1414
- [ ] No TypeScript errors (pnpm tsc --noEmit)
1515
- [ ] No hardcoded secrets or API keys
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Neon Database Branching
2+
3+
on:
4+
pull_request:
5+
types: [opened, synchronize, reopened, closed]
6+
7+
jobs:
8+
setup-neon-branch:
9+
if: github.event.action != 'closed'
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Create Neon Branch
13+
uses: neondatabase/create-branch-action@v5
14+
with:
15+
project_id: ${{ vars.NEON_PROJECT_ID }}
16+
branch_name: preview/pr-${{ github.event.number }}
17+
api_key: ${{ secrets.NEON_API_KEY }}
18+
19+
delete-neon-branch:
20+
if: github.event.action == 'closed'
21+
runs-on: ubuntu-latest
22+
steps:
23+
- name: Delete Neon Branch
24+
uses: neondatabase/delete-branch-action@v3
25+
with:
26+
project_id: ${{ vars.NEON_PROJECT_ID }}
27+
branch: preview/pr-${{ github.event.number }}
28+
api_key: ${{ secrets.NEON_API_KEY }}

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ GEMINI.md
2222
PROMPTS.md
2323

2424
# Seed scripts — local utility only, not for production
25-
scripts/seed-admin.ts
25+
scripts/seed-admin.ts

AGENTS.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -885,7 +885,6 @@ export async function GET() {
885885
886886
---
887887
888-
889888
## 21. Responsive Design Rules
890889
891890
### Core principle
@@ -988,4 +987,4 @@ Use browser DevTools responsive mode. Never ship a change that breaks any of the
988987
989988
---
990989
991-
*Last updated: May 2026*
990+
*Last updated: May 2026*

0 commit comments

Comments
 (0)