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 #3270] [MERGED] Merge develop-2.6 #12537

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

📋 Pull Request Information

Original PR: https://github.com/netbox-community/netbox/pull/3270
Author: @jeremystretch
Created: 6/20/2019
Status: ✅ Merged
Merged: 6/20/2019
Merged by: @jeremystretch

Base: develop ← Head: develop-2.6

📝 Commits (10+)

  • bd573fd implemented #2350 - config context included by default in API
  • e521508 #2350 - added virtual machines and test cases
  • fc2bb72 initial pass on migrating to custom tag model with color and comments fields
  • 0a06d92 added default values for comments and color fields on tag
  • bb6fb81 Closes #2643: Add description field to console/power components and device bays
  • fba6d28 removed migration to delete taggit models
  • b9d11aa refactor tag migrations and add changelog fields to tag
  • de52f21 fix circular import for ObjectChange, for now...
  • 8e54860 added changelog views for Tag
  • 00c4d3d Merge pull request #2918 from digitalocean/2643-description-fields

📊 Changes

175 files changed (+6772 additions, -1789 deletions)

View changed files

📝 .travis.yml (+1 -0)
📝 CHANGELOG.md (+210 -1)
📝 base_requirements.txt (+12 -0)
➕ docs/additional-features/caching.md (+21 -0)
➕ docs/additional-features/prometheus-metrics.md (+34 -0)
📝 docs/additional-features/webhooks.md (+0 -8)
📝 docs/api/overview.md (+45 -13)
📝 docs/configuration/optional-settings.md (+47 -54)
📝 docs/configuration/required-settings.md (+41 -0)
📝 docs/core-functionality/devices.md (+1 -1)
📝 docs/development/release-checklist.md (+1 -0)
📝 docs/installation/2-netbox.md (+3 -25)
📝 docs/installation/migrating-to-python3.md (+1 -7)
📝 mkdocs.yml (+2 -0)
📝 netbox/circuits/api/nested_serializers.py (+4 -2)
📝 netbox/circuits/api/serializers.py (+5 -2)
📝 netbox/circuits/api/views.py (+7 -2)
📝 netbox/circuits/filters.py (+1 -1)
➕ netbox/circuits/migrations/0015_custom_tag_models.py (+25 -0)
📝 netbox/circuits/models.py (+3 -3)

...and 80 more files

📄 Description

Merging develop-2.6 into develop in preparation for final 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/3270 **Author:** [@jeremystretch](https://github.com/jeremystretch) **Created:** 6/20/2019 **Status:** ✅ Merged **Merged:** 6/20/2019 **Merged by:** [@jeremystretch](https://github.com/jeremystretch) **Base:** `develop` ← **Head:** `develop-2.6` --- ### 📝 Commits (10+) - [`bd573fd`](https://github.com/netbox-community/netbox/commit/bd573fd5cf3273456d1ac5faabbde85509cb8387) implemented #2350 - config context included by default in API - [`e521508`](https://github.com/netbox-community/netbox/commit/e521508de99bbcab21c5f952838cef8ccc929a38) #2350 - added virtual machines and test cases - [`fc2bb72`](https://github.com/netbox-community/netbox/commit/fc2bb724fa91e5d9de83269ad3999e71753c99af) initial pass on migrating to custom tag model with color and comments fields - [`0a06d92`](https://github.com/netbox-community/netbox/commit/0a06d92c2ec334fd379712cf37c893b750e4345d) added default values for comments and color fields on tag - [`bb6fb81`](https://github.com/netbox-community/netbox/commit/bb6fb81fc0e5dfd5512f5928b4038a8ae4b7e19b) Closes #2643: Add description field to console/power components and device bays - [`fba6d28`](https://github.com/netbox-community/netbox/commit/fba6d286036d0fdaf8dcae16f8ef11787c05f6be) removed migration to delete taggit models - [`b9d11aa`](https://github.com/netbox-community/netbox/commit/b9d11aa4ca32796b17a3da72edc1f250a4950590) refactor tag migrations and add changelog fields to tag - [`de52f21`](https://github.com/netbox-community/netbox/commit/de52f219053651314bf759cbe7dfcc2050e43726) fix circular import for ObjectChange, for now... - [`8e54860`](https://github.com/netbox-community/netbox/commit/8e548605c8a2c7d5157d7b60d286dbe0fad4e1b5) added changelog views for Tag - [`00c4d3d`](https://github.com/netbox-community/netbox/commit/00c4d3dd9246ab056f433c0c0df3c3c76d9e9cfd) Merge pull request #2918 from digitalocean/2643-description-fields ### 📊 Changes **175 files changed** (+6772 additions, -1789 deletions) <details> <summary>View changed files</summary> 📝 `.travis.yml` (+1 -0) 📝 `CHANGELOG.md` (+210 -1) 📝 `base_requirements.txt` (+12 -0) ➕ `docs/additional-features/caching.md` (+21 -0) ➕ `docs/additional-features/prometheus-metrics.md` (+34 -0) 📝 `docs/additional-features/webhooks.md` (+0 -8) 📝 `docs/api/overview.md` (+45 -13) 📝 `docs/configuration/optional-settings.md` (+47 -54) 📝 `docs/configuration/required-settings.md` (+41 -0) 📝 `docs/core-functionality/devices.md` (+1 -1) 📝 `docs/development/release-checklist.md` (+1 -0) 📝 `docs/installation/2-netbox.md` (+3 -25) 📝 `docs/installation/migrating-to-python3.md` (+1 -7) 📝 `mkdocs.yml` (+2 -0) 📝 `netbox/circuits/api/nested_serializers.py` (+4 -2) 📝 `netbox/circuits/api/serializers.py` (+5 -2) 📝 `netbox/circuits/api/views.py` (+7 -2) 📝 `netbox/circuits/filters.py` (+1 -1) ➕ `netbox/circuits/migrations/0015_custom_tag_models.py` (+25 -0) 📝 `netbox/circuits/models.py` (+3 -3) _...and 80 more files_ </details> ### 📄 Description Merging `develop-2.6` into `develop` in preparation for final 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:22:09 +01:00
adam closed this issue 2025-12-29 22:22:09 +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#12537
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?