Add latest changes from gitlab-org/gitlab@master

2 files changed, 11 insertions, 1 deletions

diff --git a/lib/api/helpers/projects_helpers.rb b/lib/api/helpers/projects_helpers.rb
index f247c722c44..07f0386d14d 100644
--- a/lib/api/helpers/projects_helpers.rb
+++ b/lib/api/helpers/projects_helpers.rb
@@ -56,6 +56,14 @@ module API
         use :optional_project_params_ee
       end
 
+      params :optional_create_project_params_ee do
+      end
+
+      params :optional_create_project_params do
+        use :optional_project_params
+        use :optional_create_project_params_ee
+      end
+
       params :optional_filter_params_ee do
       end
 
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index 74de9fcec68..c28b03ac6c9 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -68,6 +68,8 @@ module API
       params :create_params do
         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
       end
 
       def load_projects
@@ -155,7 +157,7 @@ module API
         optional :name, type: String, desc: 'The name of the project'
         optional :path, type: String, desc: 'The path of the repository'
         at_least_one_of :name, :path
-        use :optional_project_params
+        use :optional_create_project_params
         use :create_params
       end
       post do