From 4714db6d28aa3069f7b2aee6f411c30928d3d59b Mon Sep 17 00:00:00 2001
From: JounQin <admin@1stg.me>
Date: Tue, 19 Dec 2023 02:36:52 +0000
Subject: [PATCH 1/2] fix: incorrect `noteable_type` type for `MergeRequest`

reference: https://docs.gitlab.com/ee/api/notes.html#get-single-merge-request-note
---
 packages/core/src/resources/MergeRequestNotes.ts | 2 +-
 packages/core/src/templates/ResourceNotes.ts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/core/src/resources/MergeRequestNotes.ts b/packages/core/src/resources/MergeRequestNotes.ts
index 2601345ef..fef97b6df 100644
--- a/packages/core/src/resources/MergeRequestNotes.ts
+++ b/packages/core/src/resources/MergeRequestNotes.ts
@@ -10,7 +10,7 @@ import type {
 } from '../infrastructure';
 
 export interface MergeRequestNoteSchema extends NoteSchema {
-  noteable_type: 'Merge request';
+  noteable_type: 'MergeRequest';
 }
 
 export interface MergeRequestNotes<C extends boolean = false> extends ResourceNotes<C> {
diff --git a/packages/core/src/templates/ResourceNotes.ts b/packages/core/src/templates/ResourceNotes.ts
index 3b53bf9bb..a6e53a1d7 100644
--- a/packages/core/src/templates/ResourceNotes.ts
+++ b/packages/core/src/templates/ResourceNotes.ts
@@ -20,7 +20,7 @@ export interface NoteSchema extends Record<string, unknown> {
   updated_at: string;
   system: boolean;
   noteable_id: number;
-  noteable_type: 'Issue' | 'Snippet' | 'Epic' | 'Commit' | 'Merge request';
+  noteable_type: 'Issue' | 'Snippet' | 'Epic' | 'Commit' | 'Merge request' | 'MergeRequest';
   noteable_iid: number;
   project_id: number;
   resolvable: boolean;

From 3da4096b2fd037834602f0e1fb2556be41a95b04 Mon Sep 17 00:00:00 2001
From: Justin Dalrymple <justin.s.dalrymple@gmail.com>
Date: Tue, 19 Dec 2023 17:04:58 -0500
Subject: [PATCH 2/2] Code review

---
 packages/core/src/templates/ResourceDiscussions.ts | 2 +-
 packages/core/src/templates/ResourceNotes.ts       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/core/src/templates/ResourceDiscussions.ts b/packages/core/src/templates/ResourceDiscussions.ts
index 78041a883..a0047da89 100644
--- a/packages/core/src/templates/ResourceDiscussions.ts
+++ b/packages/core/src/templates/ResourceDiscussions.ts
@@ -49,7 +49,7 @@ export interface DiscussionNoteSchema extends Record<string, unknown> {
   updated_at: string;
   system: boolean;
   noteable_id: number;
-  noteable_type: string;
+  noteable_type: 'Issue' | 'Snippet' | 'Epic' | 'Commit' | 'MergeRequest';
   noteable_iid: number | null;
   resolvable: boolean;
 }
diff --git a/packages/core/src/templates/ResourceNotes.ts b/packages/core/src/templates/ResourceNotes.ts
index a6e53a1d7..7f40ac200 100644
--- a/packages/core/src/templates/ResourceNotes.ts
+++ b/packages/core/src/templates/ResourceNotes.ts
@@ -20,7 +20,7 @@ export interface NoteSchema extends Record<string, unknown> {
   updated_at: string;
   system: boolean;
   noteable_id: number;
-  noteable_type: 'Issue' | 'Snippet' | 'Epic' | 'Commit' | 'Merge request' | 'MergeRequest';
+  noteable_type: 'Issue' | 'Snippet' | 'Epic' | 'Commit' | 'MergeRequest';
   noteable_iid: number;
   project_id: number;
   resolvable: boolean;