summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNejc Habjan <hab.nejc@gmail.com>2021-12-14 09:15:42 +0100
committerGitHub <noreply@github.com>2021-12-14 09:15:42 +0100
commit7799cb91efb208e26745672610431f66f1fef4f9 (patch)
tree28f5b05fa77c837df3aaba1dc970fc587feb007c
parent170a4d94acb661cba88e7c55c8ce0b33fa89e845 (diff)
parenta246ce8a942b33c5b23ac075b94237da09013fa2 (diff)
downloadgitlab-7799cb91efb208e26745672610431f66f1fef4f9.tar.gz
Merge pull request #1746 from python-gitlab/jlvillal/squash_option
feat: add support for `squash_option` in Projects
-rw-r--r--gitlab/v4/objects/projects.py2
-rw-r--r--gitlab/v4/objects/users.py1
2 files changed, 3 insertions, 0 deletions
diff --git a/gitlab/v4/objects/projects.py b/gitlab/v4/objects/projects.py
index 14519db..74671c8 100644
--- a/gitlab/v4/objects/projects.py
+++ b/gitlab/v4/objects/projects.py
@@ -692,6 +692,7 @@ class ProjectManager(CRUDMixin, RESTManager):
"show_default_award_emojis",
"snippets_access_level",
"snippets_enabled",
+ "squash_option",
"tag_list",
"template_name",
"template_project_id",
@@ -760,6 +761,7 @@ class ProjectManager(CRUDMixin, RESTManager):
"show_default_award_emojis",
"snippets_access_level",
"snippets_enabled",
+ "squash_option",
"suggestion_commit_message",
"tag_list",
"visibility",
diff --git a/gitlab/v4/objects/users.py b/gitlab/v4/objects/users.py
index 568e019..53376a9 100644
--- a/gitlab/v4/objects/users.py
+++ b/gitlab/v4/objects/users.py
@@ -500,6 +500,7 @@ class UserProjectManager(ListMixin, CreateMixin, RESTManager):
"merge_requests_enabled",
"wiki_enabled",
"snippets_enabled",
+ "squash_option",
"public",
"visibility",
"description",