Skip to content

Commit 7e25cd2

Browse files
author
anurag.ag
committed
Fixes linting
1 parent be8328d commit 7e25cd2

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

marge/merge_request.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,10 @@ def accept(self, remove_branch=False, sha=None, merge_when_pipeline_succeeds=Tru
211211
)
212212
if auto_squash is not None:
213213
params['squash'] = auto_squash
214-
return self._api.call(PUT('/projects/{0.project_id}/merge_requests/{0.iid}/merge'.format(self), params))
214+
return self._api.call(PUT(
215+
'/projects/{0.project_id}/merge_requests/{0.iid}/merge'.format(self),
216+
params
217+
))
215218

216219
def close(self):
217220
return self._api.call(PUT(

pylintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ max-line-length=110
3030
[DESIGN]
3131
max-args=10
3232
max-attributes=15
33-
max-public-methods=35
33+
max-public-methods=40
3434
# Maximum number of locals for function / method body
3535
max-locals=25
3636

0 commit comments

Comments
 (0)