github-starred/pangolin
2
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-07-16 06:08:33 -05:00
Code Issues 1.6k Packages Projects Releases 79 Wiki Activity

[PR #1736] [MERGED] fix blueprint country issue - fix #1705 - option 2 #37365

New Issue
Closed
opened 2026-06-20 15:50:15 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-06-20 15:50:15 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/fosrl/pangolin/pull/1736
Author: @Lokowitz
Created: 10/23/2025
Status: ✅ Merged
Merged: 10/25/2025
Merged by: @oschwartz10612

Base: dev ← Head: fix-geoip-blueprint

📝 Commits (3)

📊 Changes

9 files changed (+65 additions, -19 deletions)

View changed files

📝 server/lib/blueprints/proxyResources.ts (+4 -4)
📝 server/routers/badger/verifySession.ts (+1 -1)
📝 server/routers/resource/createResourceRule.ts (+1 -1)
📝 server/routers/resource/updateResourceRule.ts (+1 -1)
📝 server/setup/migrationsPg.ts (+3 -1)
📝 server/setup/migrationsSqlite.ts (+3 -1)
➕ server/setup/scriptsPg/1.11.2.ts (+24 -0)
➕ server/setup/scriptsSqlite/1.11.2.ts (+18 -0)
📝 src/app/[orgId]/settings/resources/[niceId]/rules/page.tsx (+10 -10)

📄 Description

Community Contribution License Agreement

By creating this pull request, I grant the project maintainers an unlimited,
perpetual license to use, modify, and redistribute these contributions under any terms they
choose, including both the AGPLv3 and the Fossorial Commercial license terms. I
represent that I have the right to grant this license for all contributed content.

Description

The other option related to PR1735

Test image: lokowitz75/pangolin:dev-pr432

How to test?

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/fosrl/pangolin/pull/1736 **Author:** [@Lokowitz](https://github.com/Lokowitz) **Created:** 10/23/2025 **Status:** ✅ Merged **Merged:** 10/25/2025 **Merged by:** [@oschwartz10612](https://github.com/oschwartz10612) **Base:** `dev` ← **Head:** `fix-geoip-blueprint` --- ### 📝 Commits (3) - [`4e4a38f`](https://github.com/fosrl/pangolin/commit/4e4a38f7e9f8e6a886bd8d3555e48f1760eb21d4) move to match type country instead of geoip - [`5b61742`](https://github.com/fosrl/pangolin/commit/5b6174207575ca70e124a93d5d165f5144f51d03) change geoip to country - [`5940bbd`](https://github.com/fosrl/pangolin/commit/5940bbd49876812faaa7c5c3b2565ba87c62fd50) Uppercase ### 📊 Changes **9 files changed** (+65 additions, -19 deletions) <details> <summary>View changed files</summary> 📝 `server/lib/blueprints/proxyResources.ts` (+4 -4) 📝 `server/routers/badger/verifySession.ts` (+1 -1) 📝 `server/routers/resource/createResourceRule.ts` (+1 -1) 📝 `server/routers/resource/updateResourceRule.ts` (+1 -1) 📝 `server/setup/migrationsPg.ts` (+3 -1) 📝 `server/setup/migrationsSqlite.ts` (+3 -1) ➕ `server/setup/scriptsPg/1.11.2.ts` (+24 -0) ➕ `server/setup/scriptsSqlite/1.11.2.ts` (+18 -0) 📝 `src/app/[orgId]/settings/resources/[niceId]/rules/page.tsx` (+10 -10) </details> ### 📄 Description ## Community Contribution License Agreement By creating this pull request, I grant the project maintainers an unlimited, perpetual license to use, modify, and redistribute these contributions under any terms they choose, including both the AGPLv3 and the Fossorial Commercial license terms. I represent that I have the right to grant this license for all contributed content. ## Description The other option related to [PR1735](https://github.com/fosrl/pangolin/pull/1735) Test image: lokowitz75/pangolin:dev-pr432 ## How to test? --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-06-20 15:50:15 -05:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
api
authentication
bug
config
dependencies
docker
documentation
enhancement
good first issue
help wanted
Improvement
Look Into
needs investigating
networking
new feature
non-critical bug
potential bug
pull-request
Mirrored from GitHub Pull Request
 question
reverse proxy
Security
stale
ui
wontfix
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/pangolin#37365
Delete Branch "%!s()"

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?