feat(org): add org-level branch protection rulesets & configurable help URLs #72

Merged

jmiller merged 2 commits from feature/org-branch-protection into dev 2026-05-12 20:24:15 +00:00

Conversation 0 Commits 2 Files Changed 15

+852 -4

jmiller commented 2026-05-12 20:22:56 +00:00

Owner

Copy Link

Copy Source

Summary

• Add org-level branch protection rulesets that cascade to all repos in the org
• Repo-level rules take precedence; org rules serve as fallback
• Full CRUD API: GET/POST/PATCH/DELETE /api/v1/orgs/{org}/branch_protections
• Add configurable HELP_URL and SUPPORT_URL settings (replaces hardcoded docs.gitea.com)
• Show Help/Support URLs in Site Admin > Configuration
• Establish 1261.xx.xx version convention for MokoGitea fork

Changes

Org Branch Protection (8 files)

• New migration v332: org_protected_branch table
• OrgProtectedBranch model with CRUD + glob matching
• API handlers with reqToken() + reqOrgOwnership() auth
• Inheritance logic in GetFirstMatchProtectedBranchRule()
• InheritedFrom field on BranchProtection API response

Help/Support URLs (7 files)

• HELP_URL / SUPPORT_URL in app.ini global section
• Navbar uses {{HelpURL}} template function instead of hardcoded URL
• Admin config page displays current values

Test plan

• Create org rule via API, verify it applies to repos without their own rule
• Verify repo-level rule overrides org rule for same branch pattern
• Verify rule deletion at org level removes protection from all repos
• Run existing branch protection tests for regressions
• Set HELP_URL in app.ini, verify navbar links update
• Verify admin config page shows Help/Support URLs

Closes #38

🤖 Generated with Claude Code
Co-Authored-By: Claude Opus 4.6 (1M context) noreply@anthropic.com

## Summary - Add org-level branch protection rulesets that cascade to all repos in the org - Repo-level rules take precedence; org rules serve as fallback - Full CRUD API: `GET/POST/PATCH/DELETE /api/v1/orgs/{org}/branch_protections` - Add configurable `HELP_URL` and `SUPPORT_URL` settings (replaces hardcoded docs.gitea.com) - Show Help/Support URLs in Site Admin > Configuration - Establish `1261.xx.xx` version convention for MokoGitea fork ## Changes ### Org Branch Protection (8 files) - New migration v332: `org_protected_branch` table - `OrgProtectedBranch` model with CRUD + glob matching - API handlers with `reqToken() + reqOrgOwnership()` auth - Inheritance logic in `GetFirstMatchProtectedBranchRule()` - `InheritedFrom` field on `BranchProtection` API response ### Help/Support URLs (7 files) - `HELP_URL` / `SUPPORT_URL` in `app.ini` global section - Navbar uses `{{HelpURL}}` template function instead of hardcoded URL - Admin config page displays current values ## Test plan - [ ] Create org rule via API, verify it applies to repos without their own rule - [ ] Verify repo-level rule overrides org rule for same branch pattern - [ ] Verify rule deletion at org level removes protection from all repos - [ ] Run existing branch protection tests for regressions - [ ] Set `HELP_URL` in app.ini, verify navbar links update - [ ] Verify admin config page shows Help/Support URLs Closes #38 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

jmiller added 2 commits 2026-05-12 20:22:57 +00:00

feat(org): add org-level branch protection rulesets ... 3396440926

Add organization-scoped branch protection rules that cascade to all
repos within the org. Repo-level rules take precedence; org rules
serve as the fallback when no repo rule matches a branch.

- New table: org_protected_branch (migration v332)
- OrgProtectedBranch model with full CRUD operations
- API endpoints: GET/POST/PATCH/DELETE /api/v1/orgs/{org}/branch_protections
- Inheritance via GetFirstMatchProtectedBranchRule() fallback
- InheritedFrom field added to BranchProtection API response
- Org rules use team-based whitelists (no per-user IDs at org level)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

feat(admin): add configurable Help/Support URLs and version convention ... e50e8ed851

- Add HELP_URL and SUPPORT_URL settings to app.ini (defaults to docs.gitea.com)
- Replace hardcoded docs.gitea.com in navbar with configurable HelpURL
- Expose HelpURL/SupportURL template functions
- Show Help URL and Support URL in Site Admin > Configuration
- Add locale strings for new admin config entries
- Create VERSION file (gitignored) for local builds with 1261.0.0 convention

The 1261.xx.xx version convention marks the fork starting point from
upstream Gitea. Set via VERSION file locally or GITEA_VERSION env in CI.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

jmiller merged commit 71105345ff into dev 2026-05-12 20:24:15 +00:00

jmiller referenced this issue from a commit 2026-05-12 20:24:16 +00:00

Merge pull request 'feat(org): add org-level branch protection rulesets & configurable help URLs' (#72) from feature/org-branch-protection into dev

jmiller referenced this pull request 2026-05-12 20:25:02 +00:00

release: promote dev to main — org branch protection & help URLs #73

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

Clear labels

breaking-change

Breaking API or behavior change

ci-cd

CI/CD pipeline changes

config

Configuration changes

dependencies

Dependency updates

deploy-failure

Deployment failed

docker

Docker/container changes

documentation

Documentation changes

good first issue

Good for newcomers

health-check

Repo health check result

help wanted

Extra attention needed

mokostandards

Related to MokoStandards framework

push-failure

Git push operation failed

security

Security vulnerability or hardening

size/l

200-500 lines changed

size/m

50-200 lines changed

size/s

10-50 lines changed

size/xl

500+ lines changed

size/xs

< 10 lines changed

standards-drift

Deviates from MokoStandards

standards-update

MokoStandards compliance update

sync-failure

Sync or mirror failed

tech-debt

Technical debt and TODO/FIXME items

upstream

upstream

Inherited from upstream Gitea

work-in-progress

Draft or incomplete work

No labels

Priority -

Type -

Status —

Priority —

Type —

Milestone

No items

No Milestone

Assignees

Clear assignees

jmiller (Jonathan Miller) moko-deploy (Moko Deploy Bot)

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: MokoConsulting/MokoGitea-APP#72