From 35c8c8298392188c51e5956dd2eb90bb3d81a301 Mon Sep 17 00:00:00 2001 From: Gauvain Pocentek Date: Fri, 20 Jul 2018 07:24:25 +0200 Subject: MR: add the squash attribute for create/update Closes #557 --- gitlab/v4/objects.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gitlab/v4') diff --git a/gitlab/v4/objects.py b/gitlab/v4/objects.py index 71dd90c..508ca7c 100644 --- a/gitlab/v4/objects.py +++ b/gitlab/v4/objects.py @@ -2219,13 +2219,14 @@ class ProjectMergeRequestManager(CRUDMixin, RESTManager): _create_attrs = ( ('source_branch', 'target_branch', 'title'), ('assignee_id', 'description', 'target_project_id', 'labels', - 'milestone_id', 'remove_source_branch', 'allow_maintainer_to_push') + 'milestone_id', 'remove_source_branch', 'allow_maintainer_to_push', + 'squash') ) - _update_attrs = (tuple(), - ('target_branch', 'assignee_id', 'title', 'description', - 'state_event', 'labels', 'milestone_id', - 'remove_source_branch', 'discussion_locked', - 'allow_maintainer_to_push')) + _update_attrs = ( + tuple(), + ('target_branch', 'assignee_id', 'title', 'description', 'state_event', + 'labels', 'milestone_id', 'remove_source_branch', 'discussion_locked', + 'allow_maintainer_to_push', 'squash')) _list_filters = ('state', 'order_by', 'sort', 'milestone', 'view', 'labels', 'created_after', 'created_before', 'updated_after', 'updated_before', 'scope', 'author_id', -- cgit v1.2.1