From 78780d3b98f83369a3c80115b3846f49827b0698 Mon Sep 17 00:00:00 2001 From: Christian Gumpert Date: Mon, 20 Mar 2017 11:35:00 +0100 Subject: [PATCH 1/2] add 'delete source branch' option when creating MR --- gitlab/objects.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitlab/objects.py b/gitlab/objects.py index efe75d0a6..aad8fdff1 100644 --- a/gitlab/objects.py +++ b/gitlab/objects.py @@ -1708,7 +1708,7 @@ class ProjectMergeRequest(GitlabObject): requiredUrlAttrs = ['project_id'] requiredCreateAttrs = ['source_branch', 'target_branch', 'title'] optionalCreateAttrs = ['assignee_id', 'description', 'target_project_id', - 'labels', 'milestone_id'] + 'labels', 'milestone_id','remove_source_branch'] optionalUpdateAttrs = ['target_branch', 'assignee_id', 'title', 'description', 'state_event', 'labels', 'milestone_id'] From 7cfe60fe973e98a3979cc0d502cc3a21943fad0b Mon Sep 17 00:00:00 2001 From: Gauvain Pocentek Date: Mon, 20 Mar 2017 13:06:26 +0100 Subject: [PATCH 2/2] Fix PEP8 error --- gitlab/objects.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitlab/objects.py b/gitlab/objects.py index aad8fdff1..70d130465 100644 --- a/gitlab/objects.py +++ b/gitlab/objects.py @@ -1708,7 +1708,7 @@ class ProjectMergeRequest(GitlabObject): requiredUrlAttrs = ['project_id'] requiredCreateAttrs = ['source_branch', 'target_branch', 'title'] optionalCreateAttrs = ['assignee_id', 'description', 'target_project_id', - 'labels', 'milestone_id','remove_source_branch'] + 'labels', 'milestone_id', 'remove_source_branch'] optionalUpdateAttrs = ['target_branch', 'assignee_id', 'title', 'description', 'state_event', 'labels', 'milestone_id']