summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Wittig <max.wittig95@gmail.com>2020-03-08 12:17:07 +0100
committerGitHub <noreply@github.com>2020-03-08 12:17:07 +0100
commit481bd4f70e89b4fffb35a009e5532a2cec89607a (patch)
tree62e6d27879f9398044ba898cd11eb44805bbcc2f
parent47cb58c24af48c77c372210f9e791edd2c2c98b0 (diff)
parentadc91011e46dfce909b7798b1257819ec09d01bd (diff)
downloadgitlab-481bd4f70e89b4fffb35a009e5532a2cec89607a.tar.gz
Merge pull request #1039 from python-gitlab/fix/set-approversv2.1.0
Fix/set approvers
-rw-r--r--gitlab/v4/objects.py3
-rwxr-xr-xtools/ee-test.py4
2 files changed, 4 insertions, 3 deletions
diff --git a/gitlab/v4/objects.py b/gitlab/v4/objects.py
index a349aff..13fbb53 100644
--- a/gitlab/v4/objects.py
+++ b/gitlab/v4/objects.py
@@ -2762,12 +2762,13 @@ class ProjectMergeRequestApprovalManager(GetWithoutIdMixin, UpdateMixin, RESTMan
self._parent.get_id(),
)
data = {
+ "name": "name",
"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)
+ self.gitlab.http_post(path, post_data=data, **kwargs)
class ProjectMergeRequestAwardEmoji(ObjectDeleteMixin, RESTObject):
diff --git a/tools/ee-test.py b/tools/ee-test.py
index af12957..3f75655 100755
--- a/tools/ee-test.py
+++ b/tools/ee-test.py
@@ -56,12 +56,12 @@ assert approval.approvers[0]["user"]["id"] == 1
ars = project1.approvalrules.list(all=True)
assert len(ars) == 0
-project.approvalrules.create(
+project1.approvalrules.create(
{"name": "approval-rule", "approvals_required": 1, "group_ids": [group1.id]}
)
ars = project1.approvalrules.list(all=True)
assert len(ars) == 1
-ars[0].approvals_required == 2
+assert ars[0].approvals_required == 2
ars[0].save()
ars = project1.approvalrules.list(all=True)
assert len(ars) == 1