diff options
| author | Gauvain Pocentek <gauvain@pocentek.net> | 2016-09-23 09:13:42 +0200 |
|---|---|---|
| committer | Gauvain Pocentek <gauvain@pocentek.net> | 2016-09-23 09:13:42 +0200 |
| commit | 6f7e499a93b8e80181cb8c91a5b1d63ec76f1ba0 (patch) | |
| tree | 0fdb173d55ca98c499d3e882eb0a7ff65571f018 | |
| parent | 58604213efbe4d275be8da6615ed77d6f3510cbe (diff) | |
| parent | 26d97a736022c7f6828529920d2dbc88ecada18c (diff) | |
| download | gitlab-6f7e499a93b8e80181cb8c91a5b1d63ec76f1ba0.tar.gz | |
Merge branch 'master' of github.com:gpocentek/python-gitlab
| -rw-r--r-- | gitlab/objects.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gitlab/objects.py b/gitlab/objects.py index 6606416..577cd8a 100644 --- 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): |