Merge branch 'master' of github.com:gpocentek/python-gitlab

Gauvain Pocentek · Gauvain Pocentek · commit 6f7e499a93b8 · 2016-09-23T09:13:42.000+02:00
diff --git a/gitlab/objects.py b/gitlab/objects.py
@@ -1883,14 +1883,16 @@ class Project(GitlabObject):
                            'snippets_enabled', 'container_registry_enabled',
                            'public', 'visibility_level', 'namespace_id',
                            'description', 'path', 'import_url',
-                           'builds_enabled', 'public_builds']
+                           'builds_enabled', 'public_builds',
+                           'only_allow_merge_if_build_succeeds']
     optionalUpdateAttrs = ['name', 'default_branch', 'issues_enabled',
                            'wall_enabled', 'merge_requests_enabled',
                            'wiki_enabled', 'snippets_enabled',
                            'container_registry_enabled', 'public',
                            'visibility_level', 'namespace_id', 'description',
                            'path', 'import_url', 'builds_enabled',
-                           'public_builds']
+                           'public_builds',
+                           'only_allow_merge_if_build_succeeds']
     shortPrintAttr = 'path'
     managers = [
         ('accessrequests', ProjectAccessRequestManager,
@@ -2305,7 +2307,7 @@ class UserProject(GitlabObject):
                            'merge_requests_enabled', 'wiki_enabled',
                            'snippets_enabled', 'public', 'visibility_level',
                            'description', 'builds_enabled', 'public_builds',
-                           'import_url']
+                           'import_url', 'only_allow_merge_if_build_succeeds']
 
 
 class ProjectManager(BaseManager):
