summaryrefslogtreecommitdiff
path: root/gitlab/objects.py
diff options
context:
space:
mode:
authorGauvain Pocentek <gauvain@pocentek.net>2016-08-07 21:45:43 +0200
committerGauvain Pocentek <gauvain@pocentek.net>2016-08-07 21:45:43 +0200
commitd7967c6d0d6621faf2ce294073f04b53172877d6 (patch)
treed432d1a524faa26d91365cfa416c04b2a1fc1b24 /gitlab/objects.py
parent178bfb77dd33ec9a434871c7b9b34ae320bd1ce4 (diff)
downloadgitlab-d7967c6d0d6621faf2ce294073f04b53172877d6.tar.gz
MR (un)subscribe: don't fail if state doesn't change
Diffstat (limited to 'gitlab/objects.py')
-rw-r--r--gitlab/objects.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/gitlab/objects.py b/gitlab/objects.py
index d46d4fb..3ed6598 100644
--- a/gitlab/objects.py
+++ b/gitlab/objects.py
@@ -1370,7 +1370,8 @@ class ProjectMergeRequest(GitlabObject):
r = self.gitlab._raw_post(url, **kwargs)
raise_error_from_response(r, GitlabSubscribeError, [201, 304])
- self._set_from_dict(r.json())
+ if r.status_code == 201:
+ self._set_from_dict(r.json())
def unsubscribe(self, **kwargs):
"""Unsubscribe a MR.
@@ -1385,7 +1386,8 @@ class ProjectMergeRequest(GitlabObject):
r = self.gitlab._raw_delete(url, **kwargs)
raise_error_from_response(r, GitlabUnsubscribeError, [200, 304])
- self._set_from_dict(r.json())
+ if r.status_code == 200:
+ self._set_from_dict(r.json())
def cancel_merge_when_build_succeeds(self, **kwargs):
"""Cancel merge when build succeeds."""