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 #18308] [MERGED] Prep for v4.2.0 release #15317

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

📋 Pull Request Information

Original PR: https://github.com/netbox-community/netbox/pull/18308
Author: @jeremystretch
Created: 1/6/2025
Status: ✅ Merged
Merged: 1/6/2025
Merged by: @jeremystretch

Base: develop ← Head: feature

📝 Commits (10+)

📊 Changes

456 files changed (+17540 additions, -5265 deletions)

View changed files

📝 .github/workflows/ci.yml (+1 -1)
📝 base_requirements.txt (+1 -1)
📝 docs/configuration/miscellaneous.md (+9 -7)
📝 docs/configuration/system.md (+0 -2)
📝 docs/development/adding-models.md (+3 -1)
📝 docs/features/notifications.md (+0 -2)
📝 docs/models/circuits/circuit.md (+6 -0)
📝 docs/models/circuits/circuitgroup.md (+0 -2)
📝 docs/models/circuits/circuitgroupassignment.md (+2 -2)
📝 docs/models/circuits/circuittermination.md (+3 -5)
➕ docs/models/circuits/virtualcircuit.md (+39 -0)
➕ docs/models/circuits/virtualcircuittermination.md (+23 -0)
➕ docs/models/circuits/virtualcircuittype.md (+13 -0)
📝 docs/models/dcim/interface.md (+18 -2)
📝 docs/models/dcim/inventoryitem.md (+6 -0)
➕ docs/models/dcim/macaddress.md (+13 -0)
📝 docs/models/dcim/modulebay.md (+0 -2)
📝 docs/models/dcim/moduletype.md (+0 -2)
📝 docs/models/dcim/poweroutlet.md (+6 -0)
📝 docs/models/dcim/racktype.md (+0 -2)

...and 80 more files

📄 Description

Merge feature into develop in preparation for the v4.2.0 release.

🔄 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/18308 **Author:** [@jeremystretch](https://github.com/jeremystretch) **Created:** 1/6/2025 **Status:** ✅ Merged **Merged:** 1/6/2025 **Merged by:** [@jeremystretch](https://github.com/jeremystretch) **Base:** `develop` ← **Head:** `feature` --- ### 📝 Commits (10+) - [`c60a0f4`](https://github.com/netbox-community/netbox/commit/c60a0f4f56f0cf5f259eb0b4520b84e43741e876) 16136 remove Django Admin (#17619) - [`8cd0a32`](https://github.com/netbox-community/netbox/commit/8cd0a3215ca64ef57cfe550df23c73024feb9334) 16783 Add status field to InventoryItem (#17627) - [`2c68aca`](https://github.com/netbox-community/netbox/commit/2c68aca344e64a2d6dbd8491b3c2eea759776b4c) 17195 Add color to PowerOutlet (#17623) - [`1969f0d`](https://github.com/netbox-community/netbox/commit/1969f0dc71f7c5fe75d0db54bd47b828b120fddd) fix migrations - [`3f469b0`](https://github.com/netbox-community/netbox/commit/3f469b0b0a690dfc9b2a03f95d8cea5ea846e005) 17476 Upgrade to Django 5.1 (#17620) - [`ed1327e`](https://github.com/netbox-community/netbox/commit/ed1327eeb729e0cf4805698aef74df64cf7534de) 16546 define get_absolute_url method in NetBoxModel (#17693) - [`bc597c3`](https://github.com/netbox-community/netbox/commit/bc597c3c5d038770f152d3c343b844e3f3996d92) Closes #17472: Deprecate the staged changes API - [`6568785`](https://github.com/netbox-community/netbox/commit/65687851fe093caa6382b7e9fed522b4e5316589) 16547 Add distance to Circuit (#17629) - [`256b5dc`](https://github.com/netbox-community/netbox/commit/256b5dc676c78942924bab5b071423e9ea58da77) Merge branch 'develop' into feature - [`b99c356`](https://github.com/netbox-community/netbox/commit/b99c356d1d3bab9fd6c28371f26049f961bde52b) Fix migrations conflict ### 📊 Changes **456 files changed** (+17540 additions, -5265 deletions) <details> <summary>View changed files</summary> 📝 `.github/workflows/ci.yml` (+1 -1) 📝 `base_requirements.txt` (+1 -1) 📝 `docs/configuration/miscellaneous.md` (+9 -7) 📝 `docs/configuration/system.md` (+0 -2) 📝 `docs/development/adding-models.md` (+3 -1) 📝 `docs/features/notifications.md` (+0 -2) 📝 `docs/models/circuits/circuit.md` (+6 -0) 📝 `docs/models/circuits/circuitgroup.md` (+0 -2) 📝 `docs/models/circuits/circuitgroupassignment.md` (+2 -2) 📝 `docs/models/circuits/circuittermination.md` (+3 -5) ➕ `docs/models/circuits/virtualcircuit.md` (+39 -0) ➕ `docs/models/circuits/virtualcircuittermination.md` (+23 -0) ➕ `docs/models/circuits/virtualcircuittype.md` (+13 -0) 📝 `docs/models/dcim/interface.md` (+18 -2) 📝 `docs/models/dcim/inventoryitem.md` (+6 -0) ➕ `docs/models/dcim/macaddress.md` (+13 -0) 📝 `docs/models/dcim/modulebay.md` (+0 -2) 📝 `docs/models/dcim/moduletype.md` (+0 -2) 📝 `docs/models/dcim/poweroutlet.md` (+6 -0) 📝 `docs/models/dcim/racktype.md` (+0 -2) _...and 80 more files_ </details> ### 📄 Description Merge `feature` into `develop` in preparation for the v4.2.0 release. --- <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:21:14 +01:00
adam closed this issue 2025-12-30 00:21:14 +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#15317
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?