@@ -75,6 +75,12 @@ You can get and update a single note using the ``*DiscussionNote`` resources::
     last_note.body = 'Updated comment'
     last_note.save()
 
+Resolve / unresolve a note::
+
+    last_note = discussion.notes.get(note_id)
+    last_note.resolved = True  # True to resolve, False to unresolve
+    last_note.save()
+
 Create a new discussion::
 
     discussion = resource.discussions.create({'body': 'First comment of discussion'})
 
@@ -60,6 +60,7 @@ class ProjectHookManager(CRUDMixin[ProjectHook]):
             "wiki_page_events",
             "enable_ssl_verification",
             "token",
+            "custom_webhook_template",
         ),
     )
     _update_attrs = RequiredOptional(
@@ -76,6 +77,7 @@ class ProjectHookManager(CRUDMixin[ProjectHook]):
             "wiki_events",
             "enable_ssl_verification",
             "token",
+            "custom_webhook_template",
         ),
     )
 
 
@@ -153,7 +153,7 @@ class ProjectMergeRequestDiscussionNoteManager(
         "discussion_id": "id",
     }
     _create_attrs = RequiredOptional(required=("body",), optional=("created_at",))
-    _update_attrs = RequiredOptional(required=("body",))
+    _update_attrs = RequiredOptional(exclusive=("body", "resolved"))
 
 
 class ProjectSnippetNote(SaveMixin, ObjectDeleteMixin, RESTObject):
 
@@ -69,6 +69,13 @@ def test_merge_request_discussion(project):
     discussion = mr.discussions.get(discussion.id)
     assert discussion.attributes["notes"][-1]["body"] == "updated body"
 
+    note_from_get = discussion.notes.get(note.id)
+    note_from_get.resolved = True
+    note_from_get.save()
+
+    discussion = mr.discussions.get(discussion.id)
+    assert discussion.attributes["notes"][-1]["resolved"] is True
+
     note_from_get.delete()
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ class ProjectHookManager(CRUDMixin[ProjectHook]):`
`60`	`60`	`"wiki_page_events",`
`61`	`61`	`"enable_ssl_verification",`
`62`	`62`	`"token",`
	`63`	`+ "custom_webhook_template",`
`63`	`64`	`),`
`64`	`65`	`)`
`65`	`66`	`_update_attrs = RequiredOptional(`
`@@ -76,6 +77,7 @@ class ProjectHookManager(CRUDMixin[ProjectHook]):`
`76`	`77`	`"wiki_events",`
`77`	`78`	`"enable_ssl_verification",`
`78`	`79`	`"token",`
	`80`	`+ "custom_webhook_template",`
`79`	`81`	`),`
`80`	`82`	`)`
`81`	`83`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ class ProjectMergeRequestDiscussionNoteManager(`
`153`	`153`	`"discussion_id": "id",`
`154`	`154`	`}`
`155`	`155`	`_create_attrs = RequiredOptional(required=("body",), optional=("created_at",))`
`156`		`- _update_attrs = RequiredOptional(required=("body",))`
	`156`	`+ _update_attrs = RequiredOptional(exclusive=("body", "resolved"))`
`157`	`157`
`158`	`158`
`159`	`159`	`class ProjectSnippetNote(SaveMixin, ObjectDeleteMixin, RESTObject):`