summaryrefslogtreecommitdiff
path: root/gitlab/v4/objects.py
diff options
context:
space:
mode:
authorGauvain Pocentek <gauvain@pocentek.net>2017-09-27 09:37:50 +0200
committerGauvain Pocentek <gauvain@pocentek.net>2017-09-27 09:37:50 +0200
commit69f1045627d8b5a9bdc51f8b74bf4394c95c8d9f (patch)
tree7a597b2bfa6da104c577a9b83fc4ba76a14b2435 /gitlab/v4/objects.py
parent94841060e3417d571226fd5e6da35d5080ac3ecb (diff)
downloadgitlab-69f1045627d8b5a9bdc51f8b74bf4394c95c8d9f.tar.gz
Properly handle the labels attribute in ProjectMergeRequest
This should have made it into e09581fc but something went wrong (probably a PEBCAK). Closes #325
Diffstat (limited to 'gitlab/v4/objects.py')
-rw-r--r--gitlab/v4/objects.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/gitlab/v4/objects.py b/gitlab/v4/objects.py
index 9e02560..a7bad18 100644
--- a/gitlab/v4/objects.py
+++ b/gitlab/v4/objects.py
@@ -1213,6 +1213,12 @@ class ProjectMergeRequestManager(CRUDMixin, RESTManager):
'milestone_id'))
_list_filters = ('iids', 'state', 'order_by', 'sort')
+ def _sanitize_data(self, data, action):
+ new_data = data.copy()
+ if 'labels' in data:
+ new_data['labels'] = ','.join(data['labels'])
+ return new_data
+
class ProjectMilestone(SaveMixin, ObjectDeleteMixin, RESTObject):
_short_print_attr = 'title'