Merge pull request python-gitlab#656 from esabouraud/feature-protectedbranchesoptions

gpocentek · web-flow · commit 59e3e457f018 · 2018-12-08T08:57:12.000+01:00
Issue 653 Add access control options to protected branch creation
diff --git a/docs/gl_objects/protected_branches.rst b/docs/gl_objects/protected_branches.rst
@@ -35,6 +35,15 @@ Create a protected branch::
         'push_access_level': gitlab.MAINTAINER_ACCESS
     })
 
+Create a protected branch with more granular access control::
+
+    p_branch = project.protectedbranches.create({
+        'name': '*-stable',
+        'allowed_to_push': [{"user_id": 99}, {"user_id": 98}],
+        'allowed_to_merge': [{"group_id": 653}],
+        'allowed_to_unprotect': [{"access_level": gitlab.MAINTAINER_ACCESS}]
+    })
+
 Delete a protected branch::
 
     project.protectedbranches.delete('*-stable')
diff --git a/gitlab/v4/objects.py b/gitlab/v4/objects.py
@@ -3117,7 +3117,10 @@ class ProjectProtectedBranchManager(NoUpdateMixin, RESTManager):
     _path = '/projects/%(project_id)s/protected_branches'
     _obj_cls = ProjectProtectedBranch
     _from_parent_attrs = {'project_id': 'id'}
-    _create_attrs = (('name', ), ('push_access_level', 'merge_access_level'))
+    _create_attrs = (('name', ),
+                     ('push_access_level', 'merge_access_level',
+                      'unprotect_access_level', 'allowed_to_push',
+                      'allowed_to_merge', 'allowed_to_unprotect'))
 
 
 class ProjectRunner(ObjectDeleteMixin, RESTObject):
