starred/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-01-11 21:10:29 +01:00
Code Issues 273 Packages Projects Releases 10 Wiki Activity

[PR #20190] [MERGED] Merge main into feature #15849

New Issue
Closed
opened 2025-12-30 00:24:23 +01:00 by adam · 0 comments
adam commented 2025-12-30 00:24:23 +01:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/netbox-community/netbox/pull/20190
Author: @arthanson
Created: 8/27/2025
Status: ✅ Merged
Merged: 9/2/2025
Merged by: @jeremystretch

Base: feature ← Head: merge-main

📝 Commits (4)

  • 26fb733 Merge main into feature
  • 109c85f 20190 review feedback
  • 74fbb29 20190 review feedback
  • 94e8657 Merge branch 'feature' into merge-main

📊 Changes

66 files changed (+2300 additions, -1939 deletions)

View changed files

📝 .github/ISSUE_TEMPLATE/01-feature_request.yaml (+1 -1)
📝 .github/ISSUE_TEMPLATE/02-bug_report.yaml (+1 -1)
📝 docs/administration/error-reporting.md (+1 -1)
📝 docs/reference/conditions.md (+1 -1)
📝 docs/release-notes/version-4.3.md (+28 -0)
📝 netbox/core/api/serializers_/tasks.py (+12 -2)
📝 netbox/dcim/api/serializers_/roles.py (+4 -4)
📝 netbox/dcim/api/views.py (+13 -1)
📝 netbox/dcim/filtersets.py (+15 -2)
📝 netbox/dcim/forms/bulk_create.py (+5 -2)
📝 netbox/dcim/forms/connections.py (+6 -1)
📝 netbox/dcim/forms/model_forms.py (+2 -0)
📝 netbox/dcim/tests/test_filtersets.py (+16 -0)
📝 netbox/dcim/views.py (+12 -3)
📝 netbox/extras/lookups.py (+27 -1)
📝 netbox/extras/models/customfields.py (+9 -1)
📝 netbox/extras/models/notifications.py (+8 -5)
📝 netbox/extras/tests/test_customfields.py (+11 -1)
📝 netbox/ipam/views.py (+19 -1)
📝 netbox/netbox/filtersets.py (+8 -1)

...and 46 more files

📄 Description

Merge main into feature, Several of the template files had merge conflicts:

	both modified:   netbox/templates/inc/panels/related_objects.html
	both modified:   netbox/utilities/templates/buttons/add.html
	both modified:   netbox/utilities/templatetags/buttons.py

🔄 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/netbox-community/netbox/pull/20190 **Author:** [@arthanson](https://github.com/arthanson) **Created:** 8/27/2025 **Status:** ✅ Merged **Merged:** 9/2/2025 **Merged by:** [@jeremystretch](https://github.com/jeremystretch) **Base:** `feature` ← **Head:** `merge-main` --- ### 📝 Commits (4) - [`26fb733`](https://github.com/netbox-community/netbox/commit/26fb733b3a2fbadb2234e5eba3693f136e128583) Merge main into feature - [`109c85f`](https://github.com/netbox-community/netbox/commit/109c85f76433bb50c6076878a8225929a983b769) 20190 review feedback - [`74fbb29`](https://github.com/netbox-community/netbox/commit/74fbb29cf7f8eec808bf388b76a8421980b46fc5) 20190 review feedback - [`94e8657`](https://github.com/netbox-community/netbox/commit/94e865772a639169053dcd4b9338e43e8feab1fb) Merge branch 'feature' into merge-main ### 📊 Changes **66 files changed** (+2300 additions, -1939 deletions) <details> <summary>View changed files</summary> 📝 `.github/ISSUE_TEMPLATE/01-feature_request.yaml` (+1 -1) 📝 `.github/ISSUE_TEMPLATE/02-bug_report.yaml` (+1 -1) 📝 `docs/administration/error-reporting.md` (+1 -1) 📝 `docs/reference/conditions.md` (+1 -1) 📝 `docs/release-notes/version-4.3.md` (+28 -0) 📝 `netbox/core/api/serializers_/tasks.py` (+12 -2) 📝 `netbox/dcim/api/serializers_/roles.py` (+4 -4) 📝 `netbox/dcim/api/views.py` (+13 -1) 📝 `netbox/dcim/filtersets.py` (+15 -2) 📝 `netbox/dcim/forms/bulk_create.py` (+5 -2) 📝 `netbox/dcim/forms/connections.py` (+6 -1) 📝 `netbox/dcim/forms/model_forms.py` (+2 -0) 📝 `netbox/dcim/tests/test_filtersets.py` (+16 -0) 📝 `netbox/dcim/views.py` (+12 -3) 📝 `netbox/extras/lookups.py` (+27 -1) 📝 `netbox/extras/models/customfields.py` (+9 -1) 📝 `netbox/extras/models/notifications.py` (+8 -5) 📝 `netbox/extras/tests/test_customfields.py` (+11 -1) 📝 `netbox/ipam/views.py` (+19 -1) 📝 `netbox/netbox/filtersets.py` (+8 -1) _...and 46 more files_ </details> ### 📄 Description Merge main into feature, Several of the template files had merge conflicts: ``` both modified: netbox/templates/inc/panels/related_objects.html both modified: netbox/utilities/templates/buttons/add.html both modified: netbox/utilities/templatetags/buttons.py ``` --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
adam added the pull-request label 2025-12-30 00:24:23 +01:00
adam closed this issue 2025-12-30 00:24:24 +01:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
beta
breaking change
complexity: high
complexity: low
complexity: medium
needs milestone
netbox
pending closure
plugin candidate
pull-request
Mirrored from GitHub Pull Request
 severity: high
severity: low
severity: medium
status: accepted
status: backlog
status: blocked
status: duplicate
status: needs owner
status: needs triage
status: revisions needed
status: under review
topic: GraphQL
topic: Internationalization
topic: OpenAPI
topic: UI/UX
topic: cabling
topic: event rules
topic: htmx navigation
topic: industrialization
topic: migrations
topic: plugins
topic: scripts
topic: templating
topic: testing
type: bug
type: deprecation
type: documentation
type: feature
type: housekeeping
type: translation
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
adam
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/netbox#15849
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?