From 3e4b05860d83d9120140d8dd220b0d389ddc79a9 Mon Sep 17 00:00:00 2001
From: Kevin de Jong <monkaii@hotmail.com>
Date: Mon, 17 Jun 2024 16:49:06 +0200
Subject: [PATCH] feat: support merges of remote branches

Co-authored-by: @tobias-kleinschmidt-fnt
---
 lib/action/index.js    | 2 +-
 lib/cli/index.js       | 2 +-
 lib/precommit/index.js | 2 +-
 package-lock.json      | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/action/index.js b/lib/action/index.js
index f3ddbdf..a1d6c9e 100644
--- a/lib/action/index.js
+++ b/lib/action/index.js
@@ -2252,7 +2252,7 @@ exports.getFooterElementsFromParagraph = getFooterElementsFromParagraph;
 function subjectIsMergePattern(subject) {
     const githubMergeRegex = /^Merge pull request #(\d+) from '?(.*)'?$/;
     const bitbucketMergeRegex = /^Merged in '?(.*)'? \(pull request #(\d+)\)$/;
-    const gitlabMergeRegex = /^Merge branch '?(.*?)'? into '?(.*?)'?$/;
+    const gitlabMergeRegex = /^Merge( remote-tracking)? branch '?(.*?)'? into '?(.*?)'?$/;
     return githubMergeRegex.test(subject) || bitbucketMergeRegex.test(subject) || gitlabMergeRegex.test(subject);
 }
 /**
diff --git a/lib/cli/index.js b/lib/cli/index.js
index 96135cc..390c41b 100755
--- a/lib/cli/index.js
+++ b/lib/cli/index.js
@@ -2253,7 +2253,7 @@ exports.getFooterElementsFromParagraph = getFooterElementsFromParagraph;
 function subjectIsMergePattern(subject) {
     const githubMergeRegex = /^Merge pull request #(\d+) from '?(.*)'?$/;
     const bitbucketMergeRegex = /^Merged in '?(.*)'? \(pull request #(\d+)\)$/;
-    const gitlabMergeRegex = /^Merge branch '?(.*?)'? into '?(.*?)'?$/;
+    const gitlabMergeRegex = /^Merge( remote-tracking)? branch '?(.*?)'? into '?(.*?)'?$/;
     return githubMergeRegex.test(subject) || bitbucketMergeRegex.test(subject) || gitlabMergeRegex.test(subject);
 }
 /**
diff --git a/lib/precommit/index.js b/lib/precommit/index.js
index cde5abd..2d61c90 100755
--- a/lib/precommit/index.js
+++ b/lib/precommit/index.js
@@ -2253,7 +2253,7 @@ exports.getFooterElementsFromParagraph = getFooterElementsFromParagraph;
 function subjectIsMergePattern(subject) {
     const githubMergeRegex = /^Merge pull request #(\d+) from '?(.*)'?$/;
     const bitbucketMergeRegex = /^Merged in '?(.*)'? \(pull request #(\d+)\)$/;
-    const gitlabMergeRegex = /^Merge branch '?(.*?)'? into '?(.*?)'?$/;
+    const gitlabMergeRegex = /^Merge( remote-tracking)? branch '?(.*?)'? into '?(.*?)'?$/;
     return githubMergeRegex.test(subject) || bitbucketMergeRegex.test(subject) || gitlabMergeRegex.test(subject);
 }
 /**
diff --git a/package-lock.json b/package-lock.json
index 5a46c74..fd90b55 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -673,9 +673,9 @@
       "dev": true
     },
     "node_modules/@dev-build-deploy/commit-it": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@dev-build-deploy/commit-it/-/commit-it-2.2.0.tgz",
-      "integrity": "sha512-FTG1egTOCsZAgSdqRzwTodNAsidtmp0ocFrAB4uToQI7WgY20wLl09XkudCoZbe2ZkW2m2fwSNgqLTJcICiE9Q==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@dev-build-deploy/commit-it/-/commit-it-2.3.0.tgz",
+      "integrity": "sha512-LZiPqr9y41hFKWH+WUhPQqXv1l9CzL5mAXyR1gJ2H0sylkC0ggD1WX/hWvxdRF4L7vqBftQSmr39RYI+Ff2q7g==",
       "dependencies": {
         "@dev-build-deploy/diagnose-it": "^1",
         "chalk": "<5"