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 #6175] [MERGED] Prep for v2.11 release #13105

New Issue
Closed
opened 2025-12-29 22:25:26 +01:00 by adam · 0 comments
adam commented 2025-12-29 22:25:26 +01:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/netbox-community/netbox/pull/6175
Author: @jeremystretch
Created: 4/16/2021
Status: ✅ Merged
Merged: 4/16/2021
Merged by: @jeremystretch

Base: develop ← Head: feature

📝 Commits (10+)

  • 0a6ebde Upgrade Django to 3.2b1
  • bec7ea7 Standardize model types based on function
  • 3208c83 Switch docs to mkdocs-material
  • 992657c Introduce SelectSpeedWidget
  • 2a517cd Add support for form fieldsets
  • 42e82f0 Update object edit template to use fieldsets where possible
  • cef8204 Merge tags fields with primary object fields in form display
  • d6cf385 Update CircuitTermination fields to use SelectSpeedWidget
  • 664a399 Add custom field support for organizational models to API serializers
  • ed059d8 Introduce OrganizationalModelSerializer

📊 Changes

352 files changed (+14576 additions, -6965 deletions)

View changed files

📝 base_requirements.txt (+4 -0)
📝 docs/additional-features/change-logging.md (+1 -1)
📝 docs/additional-features/custom-fields.md (+2 -1)
📝 docs/additional-features/custom-scripts.md (+4 -9)
📝 docs/additional-features/export-templates.md (+6 -1)
➕ docs/additional-features/journaling.md (+5 -0)
📝 docs/additional-features/webhooks.md (+14 -2)
📝 docs/core-functionality/circuits.md (+1 -0)
📝 docs/core-functionality/devices.md (+2 -0)
📝 docs/core-functionality/sites-and-racks.md (+3 -2)
➕ docs/development/models.md (+98 -0)
📝 docs/installation/1-postgresql.md (+18 -19)
📝 docs/installation/2-redis.md (+10 -10)
📝 docs/installation/3-netbox.md (+28 -28)
📝 docs/installation/index.md (+3 -3)
📝 docs/models/circuits/circuittermination.md (+3 -3)
➕ docs/models/circuits/providernetwork.md (+5 -0)
📝 docs/models/dcim/device.md (+1 -1)
📝 docs/models/dcim/interface.md (+8 -4)
➕ docs/models/dcim/location.md (+5 -0)

...and 80 more files

📄 Description

Merge the feature branch into develop in preparation for the v2.11.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/6175 **Author:** [@jeremystretch](https://github.com/jeremystretch) **Created:** 4/16/2021 **Status:** ✅ Merged **Merged:** 4/16/2021 **Merged by:** [@jeremystretch](https://github.com/jeremystretch) **Base:** `develop` ← **Head:** `feature` --- ### 📝 Commits (10+) - [`0a6ebde`](https://github.com/netbox-community/netbox/commit/0a6ebdee487d10702123de49646317bd0a28a0e7) Upgrade Django to 3.2b1 - [`bec7ea7`](https://github.com/netbox-community/netbox/commit/bec7ea7072364d7e99b28968a5e197050b0e5c54) Standardize model types based on function - [`3208c83`](https://github.com/netbox-community/netbox/commit/3208c8317d0cac095cd8486d5fb8d087688d64c1) Switch docs to mkdocs-material - [`992657c`](https://github.com/netbox-community/netbox/commit/992657cbe053560b71f3a0e2ac3fd50d71563276) Introduce SelectSpeedWidget - [`2a517cd`](https://github.com/netbox-community/netbox/commit/2a517cde9f929846f7bb806dbe0ee37fb17f0832) Add support for form fieldsets - [`42e82f0`](https://github.com/netbox-community/netbox/commit/42e82f0ead06fd1aa19a7d46ff5b9db6dcff0552) Update object edit template to use fieldsets where possible - [`cef8204`](https://github.com/netbox-community/netbox/commit/cef8204f4024d49eb99720fac975a70475cffb7f) Merge tags fields with primary object fields in form display - [`d6cf385`](https://github.com/netbox-community/netbox/commit/d6cf385a3c5363c63007b3d40b8e3152e708170a) Update CircuitTermination fields to use SelectSpeedWidget - [`664a399`](https://github.com/netbox-community/netbox/commit/664a39911cf28c22c45253e2077693bc2cd39ba6) Add custom field support for organizational models to API serializers - [`ed059d8`](https://github.com/netbox-community/netbox/commit/ed059d80d696e355624b24cc744388f6da11ede6) Introduce OrganizationalModelSerializer ### 📊 Changes **352 files changed** (+14576 additions, -6965 deletions) <details> <summary>View changed files</summary> 📝 `base_requirements.txt` (+4 -0) 📝 `docs/additional-features/change-logging.md` (+1 -1) 📝 `docs/additional-features/custom-fields.md` (+2 -1) 📝 `docs/additional-features/custom-scripts.md` (+4 -9) 📝 `docs/additional-features/export-templates.md` (+6 -1) ➕ `docs/additional-features/journaling.md` (+5 -0) 📝 `docs/additional-features/webhooks.md` (+14 -2) 📝 `docs/core-functionality/circuits.md` (+1 -0) 📝 `docs/core-functionality/devices.md` (+2 -0) 📝 `docs/core-functionality/sites-and-racks.md` (+3 -2) ➕ `docs/development/models.md` (+98 -0) 📝 `docs/installation/1-postgresql.md` (+18 -19) 📝 `docs/installation/2-redis.md` (+10 -10) 📝 `docs/installation/3-netbox.md` (+28 -28) 📝 `docs/installation/index.md` (+3 -3) 📝 `docs/models/circuits/circuittermination.md` (+3 -3) ➕ `docs/models/circuits/providernetwork.md` (+5 -0) 📝 `docs/models/dcim/device.md` (+1 -1) 📝 `docs/models/dcim/interface.md` (+8 -4) ➕ `docs/models/dcim/location.md` (+5 -0) _...and 80 more files_ </details> ### 📄 Description Merge the `feature` branch into `develop` in preparation for the v2.11.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-29 22:25:26 +01:00
adam closed this issue 2025-12-29 22:25:26 +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#13105
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?