dallasgroot/ForgejoKit
1
0
Fork 0
mirror of https://codeberg.org/secana/ForgejoKit.git synced 2026-06-16 05:13:53 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: missing merge titel in PRs

Browse source
This commit is contained in:
Stefan Hausotte 2026-03-22 11:29:01 +01:00
parent 373b29a21b
commit 7da2d2ce0d
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Sources/ForgejoKit/Services/PullRequestService.swift
View file

@ -34,12 +34,14 @@ public final class PullRequestService: Sendable {
private struct MergePullRequestPayload: Codable { private struct MergePullRequestPayload: Codable {
let method: String let method: String
let deleteBranchAfterMerge: Bool let deleteBranchAfterMerge: Bool
let mergeTitleField: String?
let mergeMessageField: String? let mergeMessageField: String?
// swiftlint:disable:next nesting // swiftlint:disable:next nesting
enum CodingKeys: String, CodingKey { enum CodingKeys: String, CodingKey {
case method = "Do" case method = "Do"
case deleteBranchAfterMerge = "delete_branch_after_merge" case deleteBranchAfterMerge = "delete_branch_after_merge"
case mergeTitleField = "merge_title_field"
case mergeMessageField = "merge_message_field" case mergeMessageField = "merge_message_field"
} }
} }
@ -157,13 +159,14 @@ public final class PullRequestService: Sendable {
// swiftlint:disable:next function_parameter_count // swiftlint:disable:next function_parameter_count
public func mergePullRequest( public func mergePullRequest(
owner: String, repo: String, index: Int, owner: String, repo: String, index: Int,
method: String, message: String?, method: String, title: String? = nil, message: String? = nil,
deleteBranch: Bool, deleteBranch: Bool,
) async throws { ) async throws {
let url = try client.makeRepoURL(owner: owner, repo: repo, path: "/pulls/\(index)/merge") let url = try client.makeRepoURL(owner: owner, repo: repo, path: "/pulls/\(index)/merge")
let payload = MergePullRequestPayload( let payload = MergePullRequestPayload(
method: method, method: method,
deleteBranchAfterMerge: deleteBranch, deleteBranchAfterMerge: deleteBranch,
mergeTitleField: title.nilIfEmpty,
mergeMessageField: message.nilIfEmpty, mergeMessageField: message.nilIfEmpty,
) )
let jsonData = try client.encodeRequestBody(payload) let jsonData = try client.encodeRequestBody(payload)