From b068ff63380f9275e86688e46a0e1842a1a1a07a Mon Sep 17 00:00:00 2001
From: Mark Suckerberg <mark@suckerberg.gay>
Date: Fri, 15 Sep 2023 14:05:07 -0500
Subject: [PATCH 1/3] adds merge conflict label support

---
 src/components/utils/TestMergeRow.tsx             | 5 +++++
 src/components/views/Instance/Edit/Repository.tsx | 3 +++
 src/translations/locales/en.json                  | 1 +
 src/utils/GithubClient.ts                         | 4 ++++
 4 files changed, 13 insertions(+)

diff --git a/src/components/utils/TestMergeRow.tsx b/src/components/utils/TestMergeRow.tsx
index 12ac5412..3c307bf5 100644
--- a/src/components/utils/TestMergeRow.tsx
+++ b/src/components/utils/TestMergeRow.tsx
@@ -161,6 +161,11 @@ export default function TestMergeRow({
                             <FormattedMessage id="view.instance.repo.testmergelabel" />
                         </Badge>
                     ) : null}
+                    {pr.conflictlabel ? (
+                        <Badge pill className="text-white text-capitalize mr-2" variant="danger">
+                            <FormattedMessage id="view.instance.repo.conflictlabel" />
+                        </Badge>
+                    ) : null}
                 </td>
                 <td>
                     <a href={pr.link} target="_blank" rel="noreferrer">
diff --git a/src/components/views/Instance/Edit/Repository.tsx b/src/components/views/Instance/Edit/Repository.tsx
index 9e718431..0e308d7a 100644
--- a/src/components/views/Instance/Edit/Repository.tsx
+++ b/src/components/views/Instance/Edit/Repository.tsx
@@ -958,6 +958,9 @@ class Repository extends React.Component<IProps, IState> {
                 if (a.testmergelabel !== b.testmergelabel) {
                     return a.testmergelabel ? -1 : 1;
                 }
+                if (a.conflictlabel !== b.conflictlabel) {
+                    return a.conflictlabel ? 1 : -1;
+                }
                 return a.number - b.number;
             }) ?? [];
         const filteredPendingActions = sortedPRs
diff --git a/src/translations/locales/en.json b/src/translations/locales/en.json
index 66b5dfbd..3ea2a395 100644
--- a/src/translations/locales/en.json
+++ b/src/translations/locales/en.json
@@ -416,6 +416,7 @@
     "view.instance.repo.manual.desc": "Use this box to manually test merge a pull/merge request by entering its number and clicking \"Add Test Merge\"",
     "view.instance.repo.addmanual": "Add Test Merge",
     "view.instance.repo.testmergelabel": "Labelled",
+    "view.instance.repo.conflictlabel": "Merge Conflict",
     "view.instance.repo.norepoinfo": "You lack the permission to display information about the repository",
     "view.instance.repo.delete.title": "Delete Repository",
     "view.instance.repo.delete.desc": "This will delete the local copy of the repository. Instance settings, code modifications, event scripts and static files will be preserved.",
diff --git a/src/utils/GithubClient.ts b/src/utils/GithubClient.ts
index a891e799..56fa9719 100644
--- a/src/utils/GithubClient.ts
+++ b/src/utils/GithubClient.ts
@@ -34,6 +34,7 @@ export interface PullRequest {
     head: string;
     tail: string;
     testmergelabel: boolean;
+    conflictlabel: boolean;
 }
 
 type ExtractArrayType<A> = A extends Array<infer ArrayType> ? ArrayType : never;
@@ -221,6 +222,9 @@ const e = new (class GithubClient extends TypedEmitter<IEvents> {
                 label =>
                     label.name?.toLowerCase().includes("testmerge") ||
                     label.name?.toLowerCase().includes("test merge")
+            ),
+            conflictlabel: pr.labels.some(
+                label => label.name?.toLowerCase().includes("conflict")
             )
         };
     }

From 0567979ccabd14ec64ca6ee82b3a08a62e686467 Mon Sep 17 00:00:00 2001
From: Mark Suckerberg <mark@suckerberg.gay>
Date: Fri, 15 Sep 2023 18:18:01 -0500
Subject: [PATCH 2/3] run lint fix

---
 src/utils/GithubClient.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/utils/GithubClient.ts b/src/utils/GithubClient.ts
index 56fa9719..ef2ab273 100644
--- a/src/utils/GithubClient.ts
+++ b/src/utils/GithubClient.ts
@@ -223,9 +223,7 @@ const e = new (class GithubClient extends TypedEmitter<IEvents> {
                     label.name?.toLowerCase().includes("testmerge") ||
                     label.name?.toLowerCase().includes("test merge")
             ),
-            conflictlabel: pr.labels.some(
-                label => label.name?.toLowerCase().includes("conflict")
-            )
+            conflictlabel: pr.labels.some(label => label.name?.toLowerCase().includes("conflict"))
         };
     }
 

From a5e4b6c4c4684b65c269fd99ba014ded68532c67 Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Sun, 6 Oct 2024 08:58:05 -0400
Subject: [PATCH 3/3] Fix dependabot.yml for graphql branch

---
 .github/dependabot.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index d7a51775..ab1a5063 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,7 +1,7 @@
 # https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
 version: 2
 updates:
-    - package-ecosystem: nuget
+    - package-ecosystem: npm
       directory: /
       schedule:
           interval: daily
@@ -11,3 +11,9 @@ updates:
       schedule:
           interval: daily
       open-pull-requests-limit: 100
+    - package-ecosystem: npm
+      directory: /
+      target-branch: graphql
+      schedule:
+          interval: daily
+      open-pull-requests-limit: 100