Merge pull request #17478 from netbox-community/develop

Release v4.1.1

Author: jeremystretch

…thub/ISSUE_TEMPLATE/feature_request.yaml …b/ISSUE_TEMPLATE/01-feature_request.yaml.github/ISSUE_TEMPLATE/feature_request.yaml renamed to .github/ISSUE_TEMPLATE/01-feature_request.yaml .github/ISSUE_TEMPLATE/feature_request.yaml renamed to .github/ISSUE_TEMPLATE/01-feature_request.yaml

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

.github/ISSUE_TEMPLATE/bug_report.yaml .github/ISSUE_TEMPLATE/02-bug_report.yaml.github/ISSUE_TEMPLATE/bug_report.yaml renamed to .github/ISSUE_TEMPLATE/02-bug_report.yaml

@@ -26,7 +26,7 @@ body:
     attributes:
       label: NetBox Version
       description: What version of NetBox are you currently running?
-      placeholder: v4.1.0
+      placeholder: v4.1.1
     validations:
       required: true
   - type: dropdown

…ISSUE_TEMPLATE/documentation_change.yaml …UE_TEMPLATE/03-documentation_change.yaml.github/ISSUE_TEMPLATE/documentation_change.yaml renamed to .github/ISSUE_TEMPLATE/03-documentation_change.yaml .github/ISSUE_TEMPLATE/documentation_change.yaml renamed to .github/ISSUE_TEMPLATE/03-documentation_change.yaml

@@ -45,6 +45,7 @@ jobs:
             This PR has been automatically closed due to lack of activity.
           days-before-pr-stale: 15
           days-before-pr-close: 15
+          exempt-pr-labels: 'status: blocked'
           stale-pr-label: 'pending closure'
           stale-pr-message: >
             This PR has been automatically marked as stale because it has not had

.github/ISSUE_TEMPLATE/translation.yaml …ithub/ISSUE_TEMPLATE/04-translation.yaml.github/ISSUE_TEMPLATE/translation.yaml renamed to .github/ISSUE_TEMPLATE/04-translation.yaml .github/ISSUE_TEMPLATE/translation.yaml renamed to .github/ISSUE_TEMPLATE/04-translation.yaml

@@ -84,10 +84,6 @@ Jinja2
 # https://python-markdown.github.io/changelog/
 Markdown
 
-# File inclusion plugin for Python-Markdown
-# https://github.com/cmacmackin/markdown-include
-markdown-include
-
 # MkDocs Material theme (for documentation build)
 # https://squidfunk.github.io/mkdocs-material/changelog/
 mkdocs-material

.github/ISSUE_TEMPLATE/housekeeping.yaml …thub/ISSUE_TEMPLATE/05-housekeeping.yaml.github/ISSUE_TEMPLATE/housekeeping.yaml renamed to .github/ISSUE_TEMPLATE/05-housekeeping.yaml .github/ISSUE_TEMPLATE/housekeeping.yaml renamed to .github/ISSUE_TEMPLATE/05-housekeeping.yaml

@@ -20,7 +20,7 @@
     Alias /static /opt/netbox/netbox/static
 
     <Directory /opt/netbox/netbox/static>
-        Options Indexes FollowSymLinks MultiViews
+        Options FollowSymLinks MultiViews
         AllowOverride None
         Require all granted
     </Directory>

.github/ISSUE_TEMPLATE/deprecation.yaml …ithub/ISSUE_TEMPLATE/06-deprecation.yaml.github/ISSUE_TEMPLATE/deprecation.yaml renamed to .github/ISSUE_TEMPLATE/06-deprecation.yaml .github/ISSUE_TEMPLATE/deprecation.yaml renamed to .github/ISSUE_TEMPLATE/06-deprecation.yaml

@@ -149,6 +149,7 @@
                         "nema-l15-60p",
                         "nema-l21-20p",
                         "nema-l21-30p",
+                        "nema-l22-20p",
                         "nema-l22-30p",
                         "cs6361c",
                         "cs6365c",
@@ -262,6 +263,7 @@
                         "nema-l15-60r",
                         "nema-l21-20r",
                         "nema-l21-30r",
+                        "nema-l22-20r",
                         "nema-l22-30r",
                         "CS6360C",
                         "CS6364C",
@@ -518,6 +520,14 @@
                         "urm-p4",
                         "urm-p8",
                         "splice",
+                        "usb-a",
+                        "usb-b",
+                        "usb-c",
+                        "usb-mini-a",
+                        "usb-mini-b",
+                        "usb-micro-a",
+                        "usb-micro-b",
+                        "usb-micro-ab",
                         "other"
                     ]
                 }
@@ -575,6 +585,14 @@
                         "urm-p4",
                         "urm-p8",
                         "splice",
+                        "usb-a",
+                        "usb-b",
+                        "usb-c",
+                        "usb-mini-a",
+                        "usb-mini-b",
+                        "usb-micro-a",
+                        "usb-micro-b",
+                        "usb-micro-ab",
                         "other"
                     ]
                 }