Merge pull request #353 from netbox-community/develop

Version 0.26.1
Preparation for 0.26.1
2020-10-27 12:32:43 +01:00 · 2020-10-27 10:30:55 +01:00 · 2020-10-27 10:29:07 +01:00 · 2020-10-27 09:31:47 +01:00 · 2020-10-27 09:29:34 +01:00 · 2020-10-27 15:51:12 +08:00
3 changed files with 2 additions and 3 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-0.26.0
+0.26.1
--- a/configuration/ldap/ldap_config.py
+++ b/configuration/ldap/ldap_config.py
@ -71,7 +71,7 @@ AUTH_LDAP_USER_FLAGS_BY_GROUP = {

 # For more granular permissions, we can map LDAP groups to Django groups.
 AUTH_LDAP_FIND_GROUP_PERMS = environ.get('AUTH_LDAP_FIND_GROUP_PERMS', 'True').lower() == 'true'
-AUTH_LDAP_MIRROR_GROUPS = environ.get('AUTH_LDAP_MIRROR_GROUPS', None).lower() == 'true'
+AUTH_LDAP_MIRROR_GROUPS = environ.get('AUTH_LDAP_MIRROR_GROUPS', '').lower() == 'true'

 # Cache groups for one hour to reduce LDAP traffic
 AUTH_LDAP_CACHE_TIMEOUT = int(environ.get('AUTH_LDAP_CACHE_TIMEOUT', 3600))
--- a/docker/gunicorn_config.py
+++ b/docker/gunicorn_config.py
@ -6,4 +6,3 @@ errorlog = '-'
 accesslog = '-'
 capture_output = False
 loglevel = 'info'
-raw_env = 'prometheus_multiproc_dir=/tmp/metrics'
Author	SHA1	Message	Date
Christian Mäder	097bea8702	Merge pull request #353 from netbox-community/develop Version 0.26.1	2020-10-27 12:32:43 +01:00
Christian Mäder	074960327b	Preparation for 0.26.1	2020-10-27 10:30:55 +01:00
Christian Mäder	e1462d9ca4	Merge pull request #351 from netbox-community/RevertPrometheusPreps Revert changes to 'gunicorn_config.py'	2020-10-27 10:29:07 +01:00
Christian Mäder	a5aa1bfd3b	Revert changes to 'gunicorn_config.py'	2020-10-27 09:31:47 +01:00
Christian Mäder	cb02450783	Merge pull request #350 from comphilip/release Fix "'NoneType' object has no attribute 'lower'" when no AUTH_LDAP_MI…	2020-10-27 09:29:34 +01:00
comphilip	8307560c88	Fix "'NoneType' object has no attribute 'lower'" when no AUTH_LDAP_MIRROR_GROUPS defined	2020-10-27 15:51:12 +08:00
 @ -1 +1 @@
 .26.0
 .26.1