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

[PR #1145] [MERGED] Merging v2.0 development into mainline #12169

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

📋 Pull Request Information

Original PR: https://github.com/netbox-community/netbox/pull/1145
Author: @jeremystretch
Created: 5/8/2017
Status: ✅ Merged
Merged: 5/8/2017
Merged by: @jeremystretch

Base: develop ← Head: v2-develop

📝 Commits (10+)

  • 062a5bf Initial work on API v2.0
  • 0b228ed Merge branch 'develop' into api2
  • c5fba24 Merge branch 'develop' into api2
  • 791a641 Created CircuitDetailSerializer
  • 0f9fe86 Converted static URL definitions to routers
  • b31c097 Removed Swagger
  • b8ca530 Added an endpoint for CircuitTerminations
  • acfba41 Standardized implementation of nested ViewSets
  • ddc2c8d Cleaned up device component nested serializers
  • fa900d5 Converted nested serializers to HyperlinkedModelSerializer

📊 Changes

264 files changed (+33083 additions, -21595 deletions)

View changed files

➖ Dockerfile (+0 -20)
📝 README.md (+1 -1)
➖ docker-compose.yml (+0 -53)
➖ docker/docker-entrypoint.sh (+0 -22)
➖ docker/gunicorn_config.py (+0 -5)
➖ docker/nginx.conf (+0 -35)
➖ docs/api-integration.md (+0 -19)
➕ docs/api/authentication.md (+48 -0)
➕ docs/api/examples.md (+138 -0)
➕ docs/api/overview.md (+138 -0)
➕ docs/api/working-with-secrets.md (+136 -0)
📝 docs/configuration/optional-settings.md (+16 -0)
📝 docs/data-model/dcim.md (+5 -5)
📝 docs/data-model/extras.md (+7 -0)
➖ docs/installation/docker.md (+0 -51)
📝 mkdocs.yml (+5 -2)
➖ netbox/circuits/admin.py (+0 -29)
📝 netbox/circuits/api/serializers.py (+72 -27)
📝 netbox/circuits/api/urls.py (+18 -17)
📝 netbox/circuits/api/views.py (+47 -40)

...and 80 more files

📄 Description

This pull request will merge the v2-develop branch, which has been used for parallel development of the v2.0 API, into the main develop branch. This is being done in preparation for the v2.0 release later this week.

🔄 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/1145 **Author:** [@jeremystretch](https://github.com/jeremystretch) **Created:** 5/8/2017 **Status:** ✅ Merged **Merged:** 5/8/2017 **Merged by:** [@jeremystretch](https://github.com/jeremystretch) **Base:** `develop` ← **Head:** `v2-develop` --- ### 📝 Commits (10+) - [`062a5bf`](https://github.com/netbox-community/netbox/commit/062a5bfe8d3ec3aea653d71dcfa4a715dd9dd86f) Initial work on API v2.0 - [`0b228ed`](https://github.com/netbox-community/netbox/commit/0b228ed6d34b23a049cb2b8da5909bef0e235487) Merge branch 'develop' into api2 - [`c5fba24`](https://github.com/netbox-community/netbox/commit/c5fba24cc596483e8e96fa50856d9d49cb98dabc) Merge branch 'develop' into api2 - [`791a641`](https://github.com/netbox-community/netbox/commit/791a641eef20cf129ebd6ac80b04f6dc0b2853e0) Created CircuitDetailSerializer - [`0f9fe86`](https://github.com/netbox-community/netbox/commit/0f9fe8648e0b0e73e42ac9ea855793a936f2b732) Converted static URL definitions to routers - [`b31c097`](https://github.com/netbox-community/netbox/commit/b31c097531bce78d5beacecdbf0e69c701633f35) Removed Swagger - [`b8ca530`](https://github.com/netbox-community/netbox/commit/b8ca530c55aca1de9b50b422c9828ab82c7bc34b) Added an endpoint for CircuitTerminations - [`acfba41`](https://github.com/netbox-community/netbox/commit/acfba410ddb64c8fc5dd8a2d983eee0c34cd2cd4) Standardized implementation of nested ViewSets - [`ddc2c8d`](https://github.com/netbox-community/netbox/commit/ddc2c8d1105f991c0d4a0b20366e2bbde5eb47e8) Cleaned up device component nested serializers - [`fa900d5`](https://github.com/netbox-community/netbox/commit/fa900d5dbb01215a891a0c65f29dc46d29cdee71) Converted nested serializers to HyperlinkedModelSerializer ### 📊 Changes **264 files changed** (+33083 additions, -21595 deletions) <details> <summary>View changed files</summary> ➖ `Dockerfile` (+0 -20) 📝 `README.md` (+1 -1) ➖ `docker-compose.yml` (+0 -53) ➖ `docker/docker-entrypoint.sh` (+0 -22) ➖ `docker/gunicorn_config.py` (+0 -5) ➖ `docker/nginx.conf` (+0 -35) ➖ `docs/api-integration.md` (+0 -19) ➕ `docs/api/authentication.md` (+48 -0) ➕ `docs/api/examples.md` (+138 -0) ➕ `docs/api/overview.md` (+138 -0) ➕ `docs/api/working-with-secrets.md` (+136 -0) 📝 `docs/configuration/optional-settings.md` (+16 -0) 📝 `docs/data-model/dcim.md` (+5 -5) 📝 `docs/data-model/extras.md` (+7 -0) ➖ `docs/installation/docker.md` (+0 -51) 📝 `mkdocs.yml` (+5 -2) ➖ `netbox/circuits/admin.py` (+0 -29) 📝 `netbox/circuits/api/serializers.py` (+72 -27) 📝 `netbox/circuits/api/urls.py` (+18 -17) 📝 `netbox/circuits/api/views.py` (+47 -40) _...and 80 more files_ </details> ### 📄 Description This pull request will merge the `v2-develop` branch, which has been used for parallel development of the v2.0 API, into the main `develop` branch. This is being done in preparation for the v2.0 release later this week. --- <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:20:01 +01:00
adam closed this issue 2025-12-29 22:20:01 +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#12169
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?