From bcca36e8568de1f8ecb58ddaea18e61b058b352f Mon Sep 17 00:00:00 2001
From: Zadkiel AHARONIAN <zadkiel.aharonian@gmail.com>
Date: Fri, 11 Jul 2025 11:23:21 +0200
Subject: [PATCH 1/3] fix(gitlab): support fast-forward merges (#210)

This change allows detecting that the releaser-pleaser PR is well merged.

As of today, it fails with "ERR failed to create pending releases: pull request is missing the merge commit".
---
 internal/forge/gitlab/gitlab.go | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/internal/forge/gitlab/gitlab.go b/internal/forge/gitlab/gitlab.go
index 06de7fd..d710f41 100644
--- a/internal/forge/gitlab/gitlab.go
+++ b/internal/forge/gitlab/gitlab.go
@@ -193,7 +193,7 @@ func (g *GitLab) prForCommit(ctx context.Context, commit git.Commit) (*git.PullR
 	var mergeRequest *gitlab.BasicMergeRequest
 	for _, mr := range associatedMRs {
 		// We only look for the MR that has this commit set as the "merge/squash commit" => The result of squashing this branch onto main
-		if mr.MergeCommitSHA == commit.Hash || mr.SquashCommitSHA == commit.Hash {
+		if mr.MergeCommitSHA == commit.Hash || mr.SquashCommitSHA == commit.Hash || mr.SHA == commit.Hash {
 			mergeRequest = mr
 			break
 		}
@@ -403,12 +403,15 @@ func gitlabMRToReleasePullRequest(pr *gitlab.BasicMergeRequest) *releasepr.Relea
 		}
 	}
 
-	// Commit SHA is saved in either [MergeCommitSHA] or [SquashCommitSHA] depending on which merge method was used.
+	// Commit SHA is saved in either [MergeCommitSHA], [SquashCommitSHA] or [SHA] depending on which merge method was used.
 	var releaseCommit *git.Commit
-	if pr.MergeCommitSHA != "" {
+	switch {
+	case pr.MergeCommitSHA != "":
 		releaseCommit = &git.Commit{Hash: pr.MergeCommitSHA}
-	} else if pr.SquashCommitSHA != "" {
+	case pr.SquashCommitSHA != "":
 		releaseCommit = &git.Commit{Hash: pr.SquashCommitSHA}
+	case pr.MergedAt != nil && pr.SHA != "":
+		releaseCommit = &git.Commit{Hash: pr.SHA}
 	}
 
 	return &releasepr.ReleasePullRequest{

From 8eb7eadc4ee5d6fc8071de87998efbda67d8e1ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20T=C3=B6lle?= <julian.toelle97@gmail.com>
Date: Fri, 11 Jul 2025 11:32:09 +0200
Subject: [PATCH 2/3] chore(main): release v0.6.1 (#211)

---
 CHANGELOG.md      | 6 ++++++
 action.yml        | 2 +-
 templates/run.yml | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f860642..1cb192f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [v0.6.1](https://github.com/apricote/releaser-pleaser/releases/tag/v0.6.1)
+
+### Bug Fixes
+
+- **gitlab**: support fast-forward merges (#210)
+
 ## [v0.6.0](https://github.com/apricote/releaser-pleaser/releases/tag/v0.6.0)
 
 ### ✨ Highlights
diff --git a/action.yml b/action.yml
index 07be63f..225e3cc 100644
--- a/action.yml
+++ b/action.yml
@@ -21,7 +21,7 @@ inputs:
 outputs: {}
 runs:
   using: 'docker'
-  image: docker://ghcr.io/apricote/releaser-pleaser:v0.6.0 # x-releaser-pleaser-version
+  image: docker://ghcr.io/apricote/releaser-pleaser:v0.6.1 # x-releaser-pleaser-version
   args:
     - run
     - --forge=github
diff --git a/templates/run.yml b/templates/run.yml
index e6ffe6d..c18a330 100644
--- a/templates/run.yml
+++ b/templates/run.yml
@@ -40,7 +40,7 @@ releaser-pleaser:
   resource_group: releaser-pleaser
 
   image:
-    name: ghcr.io/apricote/releaser-pleaser:v0.6.0 # x-releaser-pleaser-version
+    name: ghcr.io/apricote/releaser-pleaser:v0.6.1 # x-releaser-pleaser-version
     entrypoint: [ "" ]
   variables:
     GITLAB_TOKEN: $[[ inputs.token ]]

From 942aa80aa9f4e140c5ce96551ba0bb2c65a4d4fc Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 11 Jul 2025 16:02:05 +0000
Subject: [PATCH 3/3] deps: update dependency golangci/golangci-lint to v2.2.2
 (#212)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/ci.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index eee89f7..0cb7c52 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -20,7 +20,7 @@ jobs:
       - name: Run golangci-lint
         uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8
         with:
-          version: v2.2.1 # renovate: datasource=github-releases depName=golangci/golangci-lint
+          version: v2.2.2 # renovate: datasource=github-releases depName=golangci/golangci-lint
           args: --timeout 5m
 
   test: