Просмотр исходного кода

Merge branch 'develop' into feature

jeremystretch 4 лет назад
Родитель
Сommit
542e01775e

+ 1 - 1
.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -17,7 +17,7 @@ body:
         What version of NetBox are you currently running? (If you don't have access to the most
         recent NetBox release, consider testing on our [demo instance](https://demo.netbox.dev/)
         before opening a bug report to see if your issue has already been addressed.)
-      placeholder: v2.11.11
+      placeholder: v2.11.12
     validations:
       required: true
   - type: dropdown

+ 1 - 1
.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -14,7 +14,7 @@ body:
     attributes:
       label: NetBox version
       description: What version of NetBox are you currently running?
-      placeholder: v2.11.11
+      placeholder: v2.11.12
     validations:
       required: true
   - type: dropdown

+ 1 - 1
docs/release-notes/version-2.11.md

@@ -1,6 +1,6 @@
 # NetBox v2.11
 
-## v2.11.12 (FUTURE)
+## v2.11.12 (2021-08-23)
 
 ### Enhancements
 

+ 1 - 1
netbox/netbox/settings.py

@@ -16,7 +16,7 @@ from django.core.validators import URLValidator
 # Environment setup
 #
 
-VERSION = '3.0-beta2'
+VERSION = '3.0.0-dev'
 
 # Hostname
 HOSTNAME = platform.node()

+ 3 - 3
requirements.txt

@@ -1,9 +1,9 @@
 Django==3.2.6
-django-cors-headers==3.7.0
-django-debug-toolbar==3.2.1
+django-cors-headers==3.8.0
+django-debug-toolbar==3.2.2
 django-filter==2.4.0
 django-graphiql-debug-toolbar==0.1.4
-django-mptt==0.12.0
+django-mptt==0.13.1
 django-pglocks==1.0.4
 django-prometheus==2.1.0
 django-redis==5.0.0