summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGauvain Pocentek <gauvain@pocentek.net>2017-05-23 22:30:44 +0200
committerGauvain Pocentek <gauvain@pocentek.net>2017-05-23 22:30:44 +0200
commit9de53bf8710b826ffcacfb15330469d537add14c (patch)
tree0b42f07d6e708e46015f344f2bbaea2a4d4a29e9
parent8b75bc8d96878e5d058ebd5ec5c82383a0d92573 (diff)
downloadgitlab-9de53bf8710b826ffcacfb15330469d537add14c.tar.gz
[v4] MR s/build/pipeline/ in attributes
-rw-r--r--gitlab/v4/objects.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/gitlab/v4/objects.py b/gitlab/v4/objects.py
index 0e929b8..36f0df9 100644
--- a/gitlab/v4/objects.py
+++ b/gitlab/v4/objects.py
@@ -1223,10 +1223,10 @@ class ProjectMergeRequest(GitlabObject):
if r.status_code == 200:
self._set_from_dict(r.json())
- def cancel_merge_when_build_succeeds(self, **kwargs):
+ def cancel_merge_when_pipeline_succeeds(self, **kwargs):
"""Cancel merge when build succeeds."""
- u = ('/projects/%s/merge_requests/%s/cancel_merge_when_build_succeeds'
+ u = ('/projects/%s/merge_requests/%s/cancel_merge_when_pipeline_succeeds'
% (self.project_id, self.id))
r = self.gitlab._raw_put(u, **kwargs)
errors = {401: GitlabMRForbiddenError,