summaryrefslogtreecommitdiff
path: root/gitlab/v4/objects.py
diff options
context:
space:
mode:
Diffstat (limited to 'gitlab/v4/objects.py')
-rw-r--r--gitlab/v4/objects.py16
1 files changed, 11 insertions, 5 deletions
diff --git a/gitlab/v4/objects.py b/gitlab/v4/objects.py
index 2def952..8658520 100644
--- a/gitlab/v4/objects.py
+++ b/gitlab/v4/objects.py
@@ -1856,12 +1856,18 @@ class ProjectMergeRequestManager(CRUDMixin, RESTManager):
_create_attrs = (
('source_branch', 'target_branch', 'title'),
('assignee_id', 'description', 'target_project_id', 'labels',
- 'milestone_id', 'remove_source_branch')
+ 'milestone_id', 'remove_source_branch', 'allow_maintainer_to_push')
)
- _update_attrs = (tuple(), ('target_branch', 'assignee_id', 'title',
- 'description', 'state_event', 'labels',
- 'milestone_id'))
- _list_filters = ('iids', 'state', 'order_by', 'sort')
+ _update_attrs = (tuple(),
+ ('target_branch', 'assignee_id', 'title', 'description',
+ 'state_event', 'labels', 'milestone_id',
+ 'remove_source_branch', 'discussion_locked',
+ 'allow_maintainer_to_push'))
+ _list_filters = ('state', 'order_by', 'sort', 'milestone', 'view',
+ 'labels', 'created_after', 'created_before',
+ 'updated_after', 'updated_before', 'scope', 'author_id',
+ 'assignee_id', 'my_reaction_emoji', 'source_branch',
+ 'target_branch', 'search')
_types = {'labels': types.ListAttribute}