Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

change path for set_approvers to new api, with defaulted rule_type an…#1005

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletionsdocs/gl_objects/mr_approvals.rst
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,13 +48,12 @@ Change project-level or MR-level MR approvals settings::
p_mras.approvals_before_merge = 2
p_mras.save()

mr_mras.approvals_before_merge = 2
mr_mras.save()
mr_mras.set_approvers(approvals_required = 1)

Change project-level or MR-level MR allowed approvers::

project.approvals.set_approvers(approver_ids=[105],
approver_group_ids=[653, 654])

mr.approvals.set_approvers(approver_ids=[105],
mr.approvals.set_approvers(approvals_required = 1,approver_ids=[105],
approver_group_ids=[653, 654])
17 changes: 14 additions & 3 deletionsgitlab/v4/objects.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2685,10 +2685,13 @@ class ProjectMergeRequestApprovalManager(GetWithoutIdMixin, UpdateMixin, RESTMan
_update_uses_post = True

@exc.on_http_error(exc.GitlabUpdateError)
def set_approvers(self, approver_ids=None, approver_group_ids=None, **kwargs):
def set_approvers(
self, approvals_required, approver_ids=None, approver_group_ids=None, **kwargs
):
"""Change MR-level allowed approvers and approver groups.

Args:
approvals_required (integer): The number of required approvals for this rule
approver_ids (list): User IDs that can approve MRs
approver_group_ids (list): Group IDs whose members can approve MRs

Expand All@@ -2699,8 +2702,16 @@ def set_approvers(self, approver_ids=None, approver_group_ids=None, **kwargs):
approver_ids = approver_ids or []
approver_group_ids = approver_group_ids or []

path = "%s/%s/approvers" % (self._parent.manager.path, self._parent.get_id())
data = {"approver_ids": approver_ids, "approver_group_ids": approver_group_ids}
path = "%s/%s/approval_rules" % (
self._parent.manager.path,
self._parent.get_id(),
)
data = {
"approvals_required": approvals_required,
"rule_type": "regular",
"user_ids": approver_ids,
"group_ids": approver_group_ids,
}
self.gitlab.http_put(path, post_data=data, **kwargs)


Expand Down
4 changes: 2 additions & 2 deletionstools/ee-test.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ def end_log():
approval.save()
approval = project1.approvals.get()
assert v != approval.reset_approvals_on_push
project1.approvals.set_approvers([1], [])
project1.approvals.set_approvers(1,[1], [])
approval = project1.approvals.get()
assert approval.approvers[0]["user"]["id"] == 1

Expand All@@ -50,7 +50,7 @@ def end_log():
approval.save()
approval = mr.approvals.get()
assert approval.approvals_required == 3
mr.approvals.set_approvers([1], [])
mr.approvals.set_approvers(1,[1], [])
approval = mr.approvals.get()
assert approval.approvers[0]["user"]["id"] == 1

Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp