MokoConsulting/MokoGitea
1
0
Fork 0
Code Issues 104 Pull Requests 1 Actions Packages Projects Releases 1 Wiki Activity

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
db-tests / files-changed (pull_request) Successful in 6s
Details
docker-dryrun / files-changed (pull_request) Successful in 7s
Details
labeler / labeler (pull_request_target) Successful in 11s
Details
pr-title / lint-pr-title (pull_request) Successful in 3m9s
Details
compliance / files-changed (pull_request) Successful in 3m57s
Details
e2e-tests / files-changed (pull_request) Successful in 3m9s
Details
db-tests / test-pgsql (pull_request) Failing after 3m26s
Details
db-tests / test-sqlite (pull_request) Failing after 3m39s
Details
db-tests / test-mysql (pull_request) Failing after 8m16s
Details
docker-dryrun / container-amd64 (pull_request) Has been skipped
Details
docker-dryrun / container-arm64 (pull_request) Has been skipped
Details
docker-dryrun / container-riscv64 (pull_request) Has been skipped
Details
db-tests / test-mssql (pull_request) Failing after 7m59s
Details
compliance / lint-on-demand (pull_request) Successful in 2m33s
Details
compliance / lint-go-windows (pull_request) Failing after 3m9s
Details
compliance / lint-go-gogit (pull_request) Failing after 3m12s
Details
compliance / frontend (pull_request) Has been skipped
Details
compliance / checks-backend (pull_request) Failing after 3m5s
Details
compliance / backend (pull_request) Failing after 2m55s
Details
e2e-tests / test-e2e (pull_request) Failing after 3m3s
Details
db-tests / test-unit (pull_request) Failing after 28m41s
Details
compliance / lint-backend (pull_request) Failing after 55m37s
Details
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
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
 priority: critical
Must fix immediately
 priority: high
Important, fix soon
 priority: low
Nice to have
 priority: medium
Normal priority
 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
 status: blocked
Blocked by dependency or decision
 status: in-progress
Actively being worked on
 status: needs-review
Awaiting code review
 status: on-hold
Paused intentionally
 status: wontfix
Will not be addressed
 sync-failure
Sync or mirror failed
 type: bug
Something isn't working
 type: chore
Maintenance, dependencies, cleanup
 type: enhancement
Improvement to existing feature
 type: feature
New functionality
 type: refactor
Code restructuring without behavior change
 type: version
Version bump or release
 work-in-progress
Draft or incomplete work
bug
Something is not working
 chore
Maintenance and housekeeping
 documentation
Documentation improvements
 enhancement
Improvement to existing functionality
 feature
New feature or request
 priority: critical
Must fix immediately
 priority: high
Should fix soon
 priority: low
Nice to have
 priority: medium
Fix when convenient
 refactor
Code restructuring without behavior change
 roadmap
Planned feature or enhancement tracked on the roadmap
 scope: client
Client-specific work
 scope: dolibarr
Dolibarr modules and customizations
 scope: infrastructure
Server, CI, backups, monitoring
 scope: joomla
Joomla templates and extensions
 scope: waas
MokoWaaS platform
 security
Security vulnerability or hardening
 status: blocked
Waiting on external dependency
 status: duplicate
Duplicate of another issue
 status: in-progress
Being worked on
 status: needs-review
Ready for review
 status: wontfix
Will not be addressed
No labels
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
jmiller (Jonathan Miller) moko-deploy (Moko Deploy Bot)
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: MokoConsulting/MokoGitea#72
Delete Branch "feature/org-branch-protection"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?