chore(gitea): add PR template and instructions for merging feat/storefront into staging
All checks were successful
CI / Lint, Typecheck & Test (push) Successful in 1m49s
All checks were successful
CI / Lint, Typecheck & Test (push) Successful in 1m49s
Made-with: Cursor
This commit is contained in:
24
.gitea/OPEN_PR_TO_STAGING.md
Normal file
24
.gitea/OPEN_PR_TO_STAGING.md
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
# Open Pull Request: feat/storefront → staging
|
||||||
|
|
||||||
|
## 1. Push your branch (if needed)
|
||||||
|
```bash
|
||||||
|
git push gitea feat/storefront
|
||||||
|
```
|
||||||
|
|
||||||
|
## 2. Create the pull request in Gitea
|
||||||
|
|
||||||
|
Open this URL in your browser (replace `GITEA_BASE_URL` with your Gitea UI base, e.g. `https://72.61.144.167:3000` or your actual Gitea domain):
|
||||||
|
|
||||||
|
```
|
||||||
|
GITEA_BASE_URL/admin/the-pet-loft/compare/staging...feat/storefront
|
||||||
|
```
|
||||||
|
|
||||||
|
Or in Gitea UI:
|
||||||
|
1. Go to **admin/the-pet-loft**
|
||||||
|
2. Click **Pull requests** → **New pull request**
|
||||||
|
3. Set **Base** = `staging`, **Head** = `feat/storefront`
|
||||||
|
4. Use the pre-filled description from `.gitea/PULL_REQUEST_TEMPLATE.md` if needed
|
||||||
|
5. Create the pull request
|
||||||
|
|
||||||
|
## 3. After CI passes
|
||||||
|
Merge the PR into `staging` from the Gitea PR page.
|
||||||
14
.gitea/PULL_REQUEST_TEMPLATE.md
Normal file
14
.gitea/PULL_REQUEST_TEMPLATE.md
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
## Summary
|
||||||
|
Merge `feat/storefront` into `staging` to bring storefront and support/legal updates onto the staging branch.
|
||||||
|
|
||||||
|
## Changes (feat/storefront → staging)
|
||||||
|
- **Returns & refunds**: Support returns page, FAQ, and General Terms updated so customer bears return postage cost (deducted from refund).
|
||||||
|
- **Storefront**: Returns policy page content aligned with legal (14-day withdrawal, return address, exclusions).
|
||||||
|
- **CI**: Branch pattern in workflow updated.
|
||||||
|
|
||||||
|
## Checklist
|
||||||
|
- [ ] CI (lint, typecheck, test) passes on `feat/storefront`
|
||||||
|
- [ ] No merge conflicts with `staging`
|
||||||
|
|
||||||
|
## How to merge
|
||||||
|
After approval, merge this PR into `staging` (merge commit or squash as per your workflow).
|
||||||
Reference in New Issue
Block a user