Skip to content

Commit 29c228c

Browse files
committed
feat(functional): #2547 merge-train api : CR comments changes
1 parent 7f8fdce commit 29c228c

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

docs/gl_objects/merge_trains.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ Reference
99

1010
+ :class:`gitlab.v4.objects.ProjectMergeTrain`
1111
+ :class:`gitlab.v4.objects.ProjectMergeTrainManager`
12-
+ :class:`gilab.v4.objects.ProjectMergeTrainMergeRequest`
13-
+ :class:`gilab.v4.objects.ProjectMergeTrainMergeRequestManager`
12+
+ :class:`gitlab.v4.objects.ProjectMergeTrainMergeRequest`
13+
+ :class:`gitlab.v4.objects.ProjectMergeTrainMergeRequestManager`
1414
+ :attr:`gitlab.v4.objects.Project.merge_trains`
1515

1616
* GitLab API: https://docs.gitlab.com/api/merge_trains

gitlab/v4/objects/merge_trains.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class ProjectMergeTrainMergeRequestManager(
2525
_update_method: UpdateMethod = UpdateMethod.POST
2626

2727
_update_attrs = RequiredOptional(
28-
optional=("sha", "squash", "when_pipeline_succeeds")
28+
optional=("sha", "squash", "when_pipeline_succeeds", "auto_merge")
2929
)
3030

3131

tests/unit/objects/test_merge_trains.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
https://docs.gitlab.com/ee/api/merge_trains.html
44
"""
55

6+
from copy import deepcopy
7+
68
import pytest
79
import responses
810

@@ -46,7 +48,7 @@
4648
"duration": 70,
4749
}
4850

49-
merge_train_update = mr_content.copy()
51+
merge_train_update = deepcopy(mr_content)
5052
merge_train_update["iid"] = 4
5153
merge_train_update["pipeline"]["sha"] = "ef33a3zxc3"
5254

0 commit comments

Comments
 (0)