summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGauvain Pocentek <gauvain@pocentek.net>2016-09-23 06:14:08 +0200
committerGitHub <noreply@github.com>2016-09-23 06:14:08 +0200
commit26d97a736022c7f6828529920d2dbc88ecada18c (patch)
tree07097d898960bdc93ed65803f3e19acec4e7e61d
parent4390afbff39deb5a33b857342dae6ee494684ce7 (diff)
parent608ebbd0f50e3f526f8110d2596e1c9cae5f252b (diff)
downloadgitlab-26d97a736022c7f6828529920d2dbc88ecada18c.tar.gz
Merge pull request #155 from rafaeleyng/add-only_allow_merge_if_build_succeeds
add only_allow_merge_if_build_succeeds option to project objects
-rw-r--r--gitlab/objects.py8
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):