Skip to content

Commit a39a3a5

Browse files
Add merge request merge train API
1 parent c29c28f commit a39a3a5

3 files changed

Lines changed: 29 additions & 0 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3030
* Add support for merge request resource label event endpoints
3131
* Add support for merge request and merge request note award emoji endpoints
3232
* Add support for `MergeRequests::remove`
33+
* Add support for `MergeRequests::addToMergeTrain`
3334
* Add support for container registry endpoints
3435
* Add support for `Environments::stopStale`
3536
* Add support for `last_activity_after` and `last_activity_before` in `Groups::projects`

‎src/Api/MergeRequests.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,11 @@ public function merge(int|string $project_id, int $mr_iid, array $parameters = [
318318
return $this->put($this->getProjectPath($project_id, 'merge_requests/'.self::encodePath($mr_iid).'/merge'), $parameters);
319319
}
320320

321+
public function addToMergeTrain(int|string $project_id, int $mr_iid, array $parameters = []): mixed
322+
{
323+
return $this->post($this->getProjectPath($project_id, 'merge_trains/merge_requests/'.self::encodePath($mr_iid)), $parameters);
324+
}
325+
321326
public function showNotes(int|string $project_id, int $mr_iid): mixed
322327
{
323328
return $this->get($this->getProjectPath($project_id, 'merge_requests/'.self::encodePath($mr_iid).'/notes'));

‎tests/Api/MergeRequestsTest.php‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,29 @@ public function shouldMergeMergeRequest(): void
347347
$this->assertEquals($expectedArray, $api->merge(1, 2, ['merge_commit_message' => 'Accepted']));
348348
}
349349

350+
#[Test]
351+
public function shouldAddMergeRequestToMergeTrain(): void
352+
{
353+
$expectedArray = ['id' => 267, 'target_branch' => 'main', 'status' => 'idle'];
354+
355+
$api = $this->getApiMock();
356+
$api->expects($this->once())
357+
->method('post')
358+
->with('projects/1/merge_trains/merge_requests/2', [
359+
'auto_merge' => true,
360+
'sha' => 'abc123',
361+
'squash' => true,
362+
])
363+
->willReturn($expectedArray)
364+
;
365+
366+
$this->assertEquals($expectedArray, $api->addToMergeTrain(1, 2, [
367+
'auto_merge' => true,
368+
'sha' => 'abc123',
369+
'squash' => true,
370+
]));
371+
}
372+
350373
#[Test]
351374
public function shouldGetNotes(): void
352375
{

0 commit comments

Comments
 (0)