Skip to content

Commit 426805c

Browse files
Merge pull request #15048 from netbox-community/develop
Release v3.7.2
2 parents b871a6c + a331ba6 commit 426805c

File tree

73 files changed

+30082
-2466
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+30082
-2466
lines changed

.github/ISSUE_TEMPLATE/bug_report.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ body:
2323
attributes:
2424
label: NetBox Version
2525
description: What version of NetBox are you currently running?
26-
placeholder: v3.7.1
26+
placeholder: v3.7.2
2727
validations:
2828
required: true
2929
- type: dropdown

.github/ISSUE_TEMPLATE/feature_request.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ body:
1414
attributes:
1515
label: NetBox version
1616
description: What version of NetBox are you currently running?
17-
placeholder: v3.7.1
17+
placeholder: v3.7.2
1818
validations:
1919
required: true
2020
- type: dropdown

.github/workflows/ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@ jobs:
6868
- name: Collect static files
6969
run: python netbox/manage.py collectstatic --no-input
7070

71+
- name: Check for missing migrations
72+
run: python netbox/manage.py makemigrations --check
73+
7174
- name: Check PEP8 compliance
7275
run: pycodestyle --ignore=W504,E501 --exclude=node_modules netbox/
7376

.github/workflows/lock.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@ on:
99
permissions:
1010
issues: write
1111
pull-requests: write
12+
discussions: write
1213

1314
jobs:
1415
lock:
1516
runs-on: ubuntu-latest
1617
steps:
17-
- uses: dessant/lock-threads@v4
18+
- uses: dessant/lock-threads@v5
1819
with:
1920
issue-inactive-days: 90
2021
pr-inactive-days: 30
22+
discussion-inactive-days: 180
2123
issue-lock-reason: 'resolved'

CONTRIBUTING.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,16 @@ intake policy](https://github.com/netbox-community/netbox/wiki/Issue-Intake-Poli
8686

8787
* In most cases, it is not necessary to add a changelog entry: A maintainer will take care of this when the PR is merged. (This helps avoid merge conflicts resulting from multiple PRs being submitted simultaneously.)
8888

89-
* All code submissions should meet the following criteria (CI will enforce these checks):
89+
* All code submissions must meet the following criteria (CI will enforce these checks where feasible):
90+
* Consist entirely of original work
9091
* Python syntax is valid
9192
* All tests pass when run with `./manage.py test`
9293
* PEP 8 compliance is enforced, with the exception that lines may be
9394
greater than 80 characters in length
9495

96+
> [!CAUTION]
97+
> Any contributions which include AI-generated or reproduced content will be rejected.
98+
9599
* Some other tips to keep in mind:
96100
* If you'd like to volunteer for someone else's issue, please post a comment on that issue letting us know. (This will allow the maintainers to assign it to you.)
97101
* Check out our [developer docs](https://docs.netbox.dev/en/stable/development/getting-started/) for tips on setting up your development environment.
@@ -117,8 +121,6 @@ We're always looking for motivated individuals to join the maintainers team and
117121

118122
We generally ask that maintainers dedicate around four hours of work to the project each week on average, which includes both hands-on development and project management tasks such as issue triage. Maintainers are also encouraged (but not required) to attend our bi-weekly Zoom call to catch up on recent items.
119123

120-
Many maintainers petition their employer to grant some of their paid time to work on NetBox. In doing so, your employer becomes eligible to be featured as a [NetBox sponsor](https://github.com/netbox-community/netbox/wiki/Sponsorship).
121-
122124
Interested? You can contact our lead maintainer, Jeremy Stretch, at [email protected] or on the [NetDev Community Slack](https://netdev.chat/). We'd love to have you on the team!
123125

124126
## :heart: Other Ways to Contribute

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<a href="https://github.com/netbox-community/netbox/blob/master/LICENSE.txt"><img src="https://img.shields.io/badge/license-Apache_2.0-blue.svg" alt="License" /></a>
66
<a href="https://github.com/netbox-community/netbox/graphs/contributors"><img src="https://img.shields.io/github/contributors/netbox-community/netbox?color=blue" alt="Contributors" /></a>
77
<a href="https://github.com/netbox-community/netbox/stargazers"><img src="https://img.shields.io/github/stars/netbox-community/netbox?style=flat" alt="GitHub stars" /></a>
8-
<a href="https://explore.transifex.com/netbox-community/netbox/"><img src="https://img.shields.io/badge/languages-4-blue" alt="Languages supported" /></a>
8+
<a href="https://explore.transifex.com/netbox-community/netbox/"><img src="https://img.shields.io/badge/languages-6-blue" alt="Languages supported" /></a>
99
<a href="https://github.com/netbox-community/netbox/actions/workflows/ci.yml"><img src="https://github.com/netbox-community/netbox/workflows/CI/badge.svg?branch=master" alt="CI status" /></a>
1010
<p></p>
1111
</div>

docs/configuration/date-time.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ The time zone NetBox will use when dealing with dates and times. It is recommend
1010

1111
You may define custom formatting for date and times. For detailed instructions on writing format strings, please see [the Django documentation](https://docs.djangoproject.com/en/stable/ref/templates/builtins/#date). Default formats are listed below.
1212

13+
!!! note
14+
These system defaults will be overridden by a user's selected language/locale when [localization](./system.md#enable_localization) is enabled.
15+
1316
```python
1417
DATE_FORMAT = 'N j, Y' # June 26, 2016
1518
SHORT_DATE_FORMAT = 'Y-m-d' # 2016-06-26

docs/configuration/system.md

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,7 @@ Email is sent from NetBox only for critical events or if configured for [logging
6969

7070
Default: False
7171

72-
Determines if localization features are enabled or not. This should only be enabled for development or testing purposes as netbox is not yet fully localized. Turning this on will localize numeric and date formats (overriding what is set for DATE_FORMAT) based on the browser locale as well as translate certain strings from third party modules.
73-
74-
---
75-
76-
## GIT_PATH
77-
78-
Default: `git`
79-
80-
The system path to the `git` executable, used by the synchronization backend for remote git repositories.
72+
Determines if localization features are enabled or not. This should only be enabled for development or testing purposes as netbox is not yet fully localized. Turning this on will localize numeric and date formats (overriding any configured [system defaults](./date-time.md#date-and-time-formatting)) based on the browser locale as well as translate certain strings from third party modules.
8173

8274
---
8375

docs/installation/4-gunicorn.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,6 @@ You should see output similar to the following:
5858
If the NetBox service fails to start, issue the command `journalctl -eu netbox` to check for log messages that may indicate the problem.
5959

6060
Once you've verified that the WSGI workers are up and running, move on to HTTP server setup.
61+
62+
!!! note
63+
There is a bug in the current stable release of gunicorn (v21.2.0) where automatic restarts of the worker processes can result in 502 errors under heavy load. (See [gunicorn bug #3038](https://github.com/benoitc/gunicorn/issues/3038) for more detail.) Users who encounter this issue may opt to downgrade to an earlier, unaffected release of gunicorn (`pip install gunicorn==20.1.0`). Note, however, that this earlier release does not officially support Python 3.11.

docs/models/vpn/ikepolicy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ The IKE version employed (v1 or v2).
1414

1515
### Mode
1616

17-
The IKE mode employed (main or aggressive).
17+
The mode employed (main or aggressive) when IKEv1 is in use. This setting is not supported for IKEv2.
1818

1919
### Proposals
2020

0 commit comments

Comments
 (0)