diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-18 18:06:53 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-18 18:06:53 +0000 |
commit | 143f196f8b3c40ceb7e9335a8dcc712b079519b9 (patch) | |
tree | 909df13e1f99b456287934741ba466b506e01129 /lib/api/projects.rb | |
parent | 575ccb036ea14c6a899482a83bd985ffbc992077 (diff) | |
download | gitlab-ce-143f196f8b3c40ceb7e9335a8dcc712b079519b9.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api/projects.rb')
-rw-r--r-- | lib/api/projects.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/api/projects.rb b/lib/api/projects.rb index 3d10f41d2e0..669def2b63c 100644 --- a/lib/api/projects.rb +++ b/lib/api/projects.rb @@ -71,7 +71,8 @@ module API optional :namespace_id, type: Integer, desc: 'Namespace ID for the new project. Default to the user namespace.' optional :import_url, type: String, desc: 'URL from which the project is imported' optional :template_name, type: String, desc: "Name of template from which to create project" - mutually_exclusive :import_url, :template_name + optional :template_project_id, type: Integer, desc: "Project ID of template from which to create project" + mutually_exclusive :import_url, :template_name, :template_project_id end def load_projects |