.github/codeql/codeql-config.yml

@@ -1,11 +1,3 @@
 paths-ignore:
   # Ignore compiled JS
   - netbox/project-static/dist
-
-query-filters:
-  # Exclude py/url-redirection: NetBox uses safe_for_redirect() wrapper function
-  # which validates all redirects via Django's url_has_allowed_host_and_scheme().
-  # CodeQL's taint tracking doesn't recognize wrapper functions without custom
-  # query configuration. See #20484.
-  - exclude:
-      id: py/url-redirection

docs/plugins/development/filtersets.md

@@ -1,6 +1,6 @@
 # Filters & Filter Sets
 
-Filter sets define the mechanisms available for filtering or searching through a set of objects in NetBox. For instance, sites can be filtered by their parent region or group, status, facility ID, and so on. The same filter set is used consistently for a model whether the request is made via the UI or REST API. (Note that the GraphQL API uses a separate filter class.) NetBox employs the [django-filter](https://django-filter.readthedocs.io/en/stable/) library to define filter sets.
+Filter sets define the mechanisms available for filtering or searching through a set of objects in NetBox. For instance, sites can be filtered by their parent region or group, status, facility ID, and so on. The same filter set is used consistently for a model whether the request is made via the UI or REST API. (Note that the GraphQL API uses a separate filter class.) NetBox employs the [django-filters2](https://django-tables2.readthedocs.io/en/latest/) library to define filter sets.
 
 ## FilterSet Classes
 

netbox/circuits/apps.py

@@ -1,7 +1,5 @@
 from django.apps import AppConfig
 
-from netbox import denormalized
-
 
 class CircuitsConfig(AppConfig):
     name = "circuits"
@@ -10,16 +8,6 @@ class CircuitsConfig(AppConfig):
     def ready(self):
         from netbox.models.features import register_models
         from . import signals, search  # noqa: F401
-        from .models import CircuitTermination
 
         # Register models
         register_models(*self.get_models())
-
-        denormalized.register(CircuitTermination, '_site', {
-            '_region': 'region',
-            '_site_group': 'group',
-        })
-
-        denormalized.register(CircuitTermination, '_location', {
-            '_site': 'site',
-        })

netbox/core/plugins.py

@@ -1,5 +1,6 @@
 import datetime
 import importlib
+import importlib.util
 from dataclasses import dataclass, field
 from typing import Optional
 

netbox/dcim/migrations/0188_racktype.py

@@ -3,7 +3,9 @@ import django.db.models.deletion
 import taggit.managers
 from django.db import migrations, models
 
+import utilities.fields
 import utilities.json
+import utilities.ordering
 
 
 class Migration(migrations.Migration):

netbox/ipam/models/ip.py

@@ -548,7 +548,7 @@ class IPRange(ContactsMixin, PrimaryModel):
     mark_utilized = models.BooleanField(
         verbose_name=_('mark utilized'),
         default=False,
-        help_text=_("Report space as fully utilized")
+        help_text=_("Report space as 100% utilized")
     )
 
     clone_fields = (