From d7967c6d0d6621faf2ce294073f04b53172877d6 Mon Sep 17 00:00:00 2001 From: Gauvain Pocentek Date: Sun, 7 Aug 2016 21:45:43 +0200 Subject: MR (un)subscribe: don't fail if state doesn't change --- gitlab/objects.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gitlab/objects.py') 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.""" -- cgit v1.2.1