diff options
| author | Gauvain Pocentek <gauvain@pocentek.net> | 2017-05-23 23:22:24 +0200 |
|---|---|---|
| committer | Gauvain Pocentek <gauvain@pocentek.net> | 2017-05-23 23:22:24 +0200 |
| commit | 441244b8d91ac0674195dbb2151570712d234d15 (patch) | |
| tree | 0d749df87fbd8ed2a82067bf07d7e5420d2b75f1 /gitlab | |
| parent | cd98903d6c1a2cbf21d533d6d6d4ea58917930b1 (diff) | |
| download | gitlab-441244b8d91ac0674195dbb2151570712d234d15.tar.gz | |
pop8 fixes
Diffstat (limited to 'gitlab')
| -rw-r--r-- | gitlab/v4/objects.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gitlab/v4/objects.py b/gitlab/v4/objects.py index 0a6ae41..4e65893 100644 --- a/gitlab/v4/objects.py +++ b/gitlab/v4/objects.py @@ -134,7 +134,8 @@ class User(GitlabObject): optionalUpdateAttrs = ['password', 'skype', 'linkedin', 'twitter', 'projects_limit', 'extern_uid', 'provider', 'bio', 'admin', 'can_create_group', 'website_url', - 'skip_confirmation', 'external', 'organization', 'location'] + 'skip_confirmation', 'external', 'organization', + 'location'] managers = ( ('emails', 'UserEmailManager', [('user_id', 'id')]), ('keys', 'UserKeyManager', [('user_id', 'id')]), @@ -1236,7 +1237,8 @@ class ProjectMergeRequest(GitlabObject): def cancel_merge_when_pipeline_succeeds(self, **kwargs): """Cancel merge when build succeeds.""" - u = ('/projects/%s/merge_requests/%s/cancel_merge_when_pipeline_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, |