starred/panel-pelican-dev
1
0
Fork 0
mirror of https://github.com/pelican-dev/panel.git synced 2026-07-16 04:03:50 +03:00
Code Issues 41 Packages Projects Releases 10 Wiki Activity

[PR #2076] [MERGED] Add changes from upstream #1745

New Issue
Closed
opened 2026-02-05 18:23:31 +03:00 by OVERLORD · 0 comments
OVERLORD commented 2026-02-05 18:23:31 +03:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/pelican-dev/panel/pull/2076
Author: @Boy132
Created: 1/6/2026
Status: ✅ Merged
Merged: 1/13/2026
Merged by: @Boy132

Base: main ← Head: boy132/upstream-changes

📝 Commits (10+)

  • 7b34f7d change "Github" to "GitHub" for consistency
  • 768023e Disconnect SFTP/Websocket when a user is removed as a subuser
  • 34c86c7 Clear allocation notes on server deletion
  • bda9ddd Don't be strict about upload size, so long as it is a positive integer
  • 5fd2c47 Add throttling to resource creation endpoints
  • 1c4c68c Lock the server's resource models when adding new ones
  • 5060038 small fix
  • 9eca887 fix tests
  • 0085fe5 remove duplicate
  • fad5868 fix tests part two

📊 Changes

25 files changed (+192 additions, -56 deletions)

View changed files

➕ app/Enums/ResourceLimit.php (+65 -0)
📝 app/Extensions/OAuth/Schemas/GithubSchema.php (+2 -2)
📝 app/Filament/Admin/Resources/Nodes/Pages/CreateNode.php (+1 -3)
📝 app/Filament/Admin/Resources/Nodes/Pages/EditNode.php (+3 -3)
📝 app/Http/Controllers/Api/Client/Servers/BackupController.php (+12 -6)
📝 app/Http/Controllers/Api/Client/Servers/DatabaseController.php (+8 -5)
📝 app/Http/Controllers/Api/Client/Servers/NetworkAllocationController.php (+11 -8)
📝 app/Http/Controllers/Api/Remote/Backups/BackupRemoteUploadController.php (+1 -1)
📝 app/Models/Node.php (+1 -1)
📝 app/Providers/RouteServiceProvider.php (+3 -0)
📝 app/Repositories/Daemon/DaemonServerRepository.php (+18 -0)
📝 app/Services/Servers/DetailsModificationService.php (+1 -1)
📝 app/Services/Servers/ServerDeletionService.php (+4 -1)
📝 app/Services/Subusers/SubuserDeletionService.php (+1 -1)
📝 app/Services/Subusers/SubuserUpdateService.php (+1 -1)
📝 bootstrap/app.php (+4 -0)
📝 config/backups.php (+6 -5)
📝 config/http.php (+1 -1)
📝 contributing.md (+1 -1)
➕ database/migrations/2026_01_09_134116_clear_unused_allocation_notes.php (+25 -0)

...and 5 more files

📄 Description

Requires https://github.com/pelican-dev/wings/pull/156

512cfad6bf
2bd9d8badd
3dd206ccf7
a215f6d534
09caa0d499
d4580076c2

🔄 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/pelican-dev/panel/pull/2076 **Author:** [@Boy132](https://github.com/Boy132) **Created:** 1/6/2026 **Status:** ✅ Merged **Merged:** 1/13/2026 **Merged by:** [@Boy132](https://github.com/Boy132) **Base:** `main` ← **Head:** `boy132/upstream-changes` --- ### 📝 Commits (10+) - [`7b34f7d`](https://github.com/pelican-dev/panel/commit/7b34f7dff3ba0a340b4a8936d1f7b7ecea16c05a) change "Github" to "GitHub" for consistency - [`768023e`](https://github.com/pelican-dev/panel/commit/768023ea2138f05556d7f8b87778ef7e468abca1) Disconnect SFTP/Websocket when a user is removed as a subuser - [`34c86c7`](https://github.com/pelican-dev/panel/commit/34c86c7b2051723efd105731687b2ad8ee8723b4) Clear allocation notes on server deletion - [`bda9ddd`](https://github.com/pelican-dev/panel/commit/bda9ddd92c236a6900bd9ee3c887ff435ddf4e33) Don't be strict about upload size, so long as it is a positive integer - [`5fd2c47`](https://github.com/pelican-dev/panel/commit/5fd2c4785f025c38c7a7ca32370f7dc3e6c2d38c) Add throttling to resource creation endpoints - [`1c4c68c`](https://github.com/pelican-dev/panel/commit/1c4c68c2363d4ebd9d556a60f47c98b176f7b847) Lock the server's resource models when adding new ones - [`5060038`](https://github.com/pelican-dev/panel/commit/506003897f3d0f0438a516ceb2a981e3213e15bd) small fix - [`9eca887`](https://github.com/pelican-dev/panel/commit/9eca8873ef51b282fa8c24acecd24bd3d2b752af) fix tests - [`0085fe5`](https://github.com/pelican-dev/panel/commit/0085fe526648cf0735d1d3150edc2b9704618c8a) remove duplicate - [`fad5868`](https://github.com/pelican-dev/panel/commit/fad5868da7e8457337c2b07f82576a9d61998ebd) fix tests part two ### 📊 Changes **25 files changed** (+192 additions, -56 deletions) <details> <summary>View changed files</summary> ➕ `app/Enums/ResourceLimit.php` (+65 -0) 📝 `app/Extensions/OAuth/Schemas/GithubSchema.php` (+2 -2) 📝 `app/Filament/Admin/Resources/Nodes/Pages/CreateNode.php` (+1 -3) 📝 `app/Filament/Admin/Resources/Nodes/Pages/EditNode.php` (+3 -3) 📝 `app/Http/Controllers/Api/Client/Servers/BackupController.php` (+12 -6) 📝 `app/Http/Controllers/Api/Client/Servers/DatabaseController.php` (+8 -5) 📝 `app/Http/Controllers/Api/Client/Servers/NetworkAllocationController.php` (+11 -8) 📝 `app/Http/Controllers/Api/Remote/Backups/BackupRemoteUploadController.php` (+1 -1) 📝 `app/Models/Node.php` (+1 -1) 📝 `app/Providers/RouteServiceProvider.php` (+3 -0) 📝 `app/Repositories/Daemon/DaemonServerRepository.php` (+18 -0) 📝 `app/Services/Servers/DetailsModificationService.php` (+1 -1) 📝 `app/Services/Servers/ServerDeletionService.php` (+4 -1) 📝 `app/Services/Subusers/SubuserDeletionService.php` (+1 -1) 📝 `app/Services/Subusers/SubuserUpdateService.php` (+1 -1) 📝 `bootstrap/app.php` (+4 -0) 📝 `config/backups.php` (+6 -5) 📝 `config/http.php` (+1 -1) 📝 `contributing.md` (+1 -1) ➕ `database/migrations/2026_01_09_134116_clear_unused_allocation_notes.php` (+25 -0) _...and 5 more files_ </details> ### 📄 Description Requires https://github.com/pelican-dev/wings/pull/156 https://github.com/pterodactyl/panel/commit/512cfad6bf5849c70476cd4bf3b3e290e09b0cb5 https://github.com/pterodactyl/panel/commit/2bd9d8baddb0e0606e4a9d5be402f48678ac88d5 https://github.com/pterodactyl/panel/commit/3dd206ccf75ec772597ee1af76a237ca8c408441 https://github.com/pterodactyl/panel/commit/a215f6d534dfe45d6818e399e391feae5a11191c https://github.com/pterodactyl/panel/commit/09caa0d4995bd924b53b9a9e9b4883ac27bd5607 https://github.com/pterodactyl/panel/commit/d4580076c22bdd77513e53c6e72bda4c8451799f --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
OVERLORD added the pull-request label 2026-02-05 18:23:31 +03:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
not confirmed
pull-request
Mirrored from GitHub Pull Request
 👑 sponsor
💰 fund
🔴 hard
🟡 medium
🟡 medium
🟡 medium
🟢 easy
🟢 easy
🟢 easy
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
OVERLORD
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/panel-pelican-dev#1745
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?