From fbcf4c268bf7751f761f36834e87c7354570ad0f Mon Sep 17 00:00:00 2001
From: Arthur <worldnomad@gmail.com>
Date: Tue, 2 May 2023 10:59:55 -0700
Subject: [PATCH 1/3] 12436 remove add button from contactassignment list view

---
 netbox/tenancy/views.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/netbox/tenancy/views.py b/netbox/tenancy/views.py
index ba7249c8d..b9ada8640 100644
--- a/netbox/tenancy/views.py
+++ b/netbox/tenancy/views.py
@@ -352,6 +352,7 @@ class ContactAssignmentListView(generic.ObjectListView):
     filterset = filtersets.ContactAssignmentFilterSet
     filterset_form = forms.ContactAssignmentFilterForm
     table = tables.ContactAssignmentTable
+    actions = ('export', 'bulk_edit', 'bulk_delete')
 
 
 @register_model_view(ContactAssignment, 'edit')

From 7aa8434575f0c69f0c314c5316386ddb8b445b49 Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@netboxlabs.com>
Date: Tue, 2 May 2023 16:40:56 -0400
Subject: [PATCH 2/3] Changelog for #12367, #12410, #12436

---
 docs/release-notes/version-3.5.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/release-notes/version-3.5.md b/docs/release-notes/version-3.5.md
index d6e7bdb53..168f15fcb 100644
--- a/docs/release-notes/version-3.5.md
+++ b/docs/release-notes/version-3.5.md
@@ -4,6 +4,7 @@
 
 ### Bug Fixes
 
+* [#12367](https://github.com/netbox-community/netbox/issues/12367) - Fix `RelatedObjectDoesNotExist` exception under certain conditions (regression from #11550)
 * [#12380](https://github.com/netbox-community/netbox/issues/12380) - Allow selecting object change as model under object list widget configuration
 * [#12384](https://github.com/netbox-community/netbox/issues/12384) - Add a three-second timeout for RSS reader widget
 * [#12395](https://github.com/netbox-community/netbox/issues/12395) - Fix "create & add another" action for objects with custom fields
@@ -11,8 +12,10 @@
 * [#12400](https://github.com/netbox-community/netbox/issues/12400) - Validate default values for object and multi-object custom fields
 * [#12401](https://github.com/netbox-community/netbox/issues/12401) - Support the creation of front ports without a pre-populated device ID
 * [#12405](https://github.com/netbox-community/netbox/issues/12405) - Fix filtering for VLAN groups displayed under site view
+* [#12410](https://github.com/netbox-community/netbox/issues/12410) - Fix base path for OpenAPI schema (fixes Swagger UI requests)
 * [#12412](https://github.com/netbox-community/netbox/issues/12412) - Device/VM interface MAC addresses can be nullified via REST API
 * [#12415](https://github.com/netbox-community/netbox/issues/12415) - Fix `ImportError` exception when running RQ worker
+* [#12436](https://github.com/netbox-community/netbox/issues/12436) - Remove extraneous "add" button from contact assignments list
 
 ---
 

From b14a514b4752bd69dd1b6495ff8f1d5678aab95c Mon Sep 17 00:00:00 2001
From: Austin de Coup-Crank <94914780+decoupca@users.noreply.github.com>
Date: Tue, 2 May 2023 15:47:22 -0500
Subject: [PATCH 3/3] Closes 10759: Enable markdown support for custom field
 descriptions (#12344)

* enable markdown in custom field descriptions

* Closes #10759: Enable markdown support for custom field descriptions

---------

Co-authored-by: Jeremy Stretch <jstretch@netboxlabs.com>
---
 netbox/extras/tables/tables.py           | 1 +
 netbox/templates/extras/customfield.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/netbox/extras/tables/tables.py b/netbox/extras/tables/tables.py
index 6787b0c75..59b45c059 100644
--- a/netbox/extras/tables/tables.py
+++ b/netbox/extras/tables/tables.py
@@ -29,6 +29,7 @@ class CustomFieldTable(NetBoxTable):
     content_types = columns.ContentTypesColumn()
     required = columns.BooleanColumn()
     ui_visibility = columns.ChoiceFieldColumn(verbose_name="UI visibility")
+    description = columns.MarkdownColumn()
     is_cloneable = columns.BooleanColumn()
 
     class Meta(NetBoxTable.Meta):
diff --git a/netbox/templates/extras/customfield.html b/netbox/templates/extras/customfield.html
index 4c103d4c6..b783c8a77 100644
--- a/netbox/templates/extras/customfield.html
+++ b/netbox/templates/extras/customfield.html
@@ -32,7 +32,7 @@
           </tr>
           <tr>
             <th scope="row">Description</th>
-            <td>{{ object.description|placeholder }}</td>
+            <td>{{ object.description|markdown|placeholder }}</td>
           </tr>
           <tr>
             <th scope="row">Required</th>