Merge branch 'master' into 'docs-hard-tabs'docs-hard-tabs

# Conflicts:
#   doc/administration/pseudonymizer.md
#   doc/administration/uploads.md

1 files changed, 38 insertions, 7 deletions

diff --git a/lib/api/helpers/projects_helpers.rb b/lib/api/helpers/projects_helpers.rb
index f242f1fea0e..0e21a7a66fd 100644
--- a/lib/api/helpers/projects_helpers.rb
+++ b/lib/api/helpers/projects_helpers.rb
@@ -8,12 +8,26 @@ module API
 
       params :optional_project_params_ce do
         optional :description, type: String, desc: 'The description of the project'
+        optional :build_git_strategy, type: String, values: %w(fetch clone), desc: 'The Git strategy. Defaults to `fetch`'
+        optional :build_timeout, type: Integer, desc: 'Build timeout'
+        optional :auto_cancel_pending_pipelines, type: String, values: %w(disabled enabled), desc: 'Auto-cancel pending pipelines'
+        optional :build_coverage_regex, type: String, desc: 'Test coverage parsing'
         optional :ci_config_path, type: String, desc: 'The path to CI config file. Defaults to `.gitlab-ci.yml`'
+
+        # TODO: remove in API v5, replaced by *_access_level
         optional :issues_enabled, type: Boolean, desc: 'Flag indication if the issue tracker is enabled'
         optional :merge_requests_enabled, type: Boolean, desc: 'Flag indication if merge requests are enabled'
         optional :wiki_enabled, type: Boolean, desc: 'Flag indication if the wiki is enabled'
         optional :jobs_enabled, type: Boolean, desc: 'Flag indication if jobs are enabled'
         optional :snippets_enabled, type: Boolean, desc: 'Flag indication if snippets are enabled'
+
+        optional :issues_access_level, type: String, values: %w(disabled private enabled), desc: 'Issues access level. One of `disabled`, `private` or `enabled`'
+        optional :repository_access_level, type: String, values: %w(disabled private enabled), desc: 'Repository access level. One of `disabled`, `private` or `enabled`'
+        optional :merge_requests_access_level, type: String, values: %w(disabled private enabled), desc: 'Merge requests access level. One of `disabled`, `private` or `enabled`'
+        optional :wiki_access_level, type: String, values: %w(disabled private enabled), desc: 'Wiki access level. One of `disabled`, `private` or `enabled`'
+        optional :builds_access_level, type: String, values: %w(disabled private enabled), desc: 'Builds access level. One of `disabled`, `private` or `enabled`'
+        optional :snippets_access_level, type: String, values: %w(disabled private enabled), desc: 'Snippets access level. One of `disabled`, `private` or `enabled`'
+
         optional :shared_runners_enabled, type: Boolean, desc: 'Flag indication if shared runners are enabled for that project'
         optional :resolve_outdated_diff_discussions, type: Boolean, desc: 'Automatically resolve merge request diffs discussions on lines changed with a push'
         optional :container_registry_enabled, type: Boolean, desc: 'Flag indication if the container registry is enabled for that project'
@@ -30,6 +44,8 @@ module API
         optional :initialize_with_readme, type: Boolean, desc: "Initialize a project with a README.md"
         optional :external_authorization_classification_label, type: String, desc: 'The classification label for the project'
         optional :ci_default_git_depth, type: Integer, desc: 'Default number of revisions for shallow cloning'
+        optional :auto_devops_enabled, type: Boolean, desc: 'Flag indication if Auto DevOps is enabled'
+        optional :auto_devops_deploy_strategy, type: String, values: %w(continuous manual timed_incremental), desc: 'Auto Deploy strategy'
       end
 
       params :optional_project_params_ee do
@@ -48,15 +64,20 @@ module API
 
       def self.update_params_at_least_one_of
         [
-          :jobs_enabled,
-          :resolve_outdated_diff_discussions,
+          :auto_devops_enabled,
+          :auto_devops_deploy_strategy,
+          :auto_cancel_pending_pipelines,
+          :build_coverage_regex,
+          :build_git_strategy,
+          :build_timeout,
+          :builds_access_level,
           :ci_config_path,
           :container_registry_enabled,
           :default_branch,
           :description,
-          :issues_enabled,
+          :issues_access_level,
           :lfs_enabled,
-          :merge_requests_enabled,
+          :merge_requests_access_level,
           :merge_method,
           :name,
           :only_allow_merge_if_all_discussions_are_resolved,
@@ -64,14 +85,24 @@ module API
           :path,
           :printing_merge_request_link_enabled,
           :public_builds,
+          :repository_access_level,
           :request_access_enabled,
+          :resolve_outdated_diff_discussions,
           :shared_runners_enabled,
-          :snippets_enabled,
+          :snippets_access_level,
           :tag_list,
           :visibility,
-          :wiki_enabled,
+          :wiki_access_level,
           :avatar,
-          :external_authorization_classification_label
+          :external_authorization_classification_label,
+
+          # TODO: remove in API v5, replaced by *_access_level
+          :issues_enabled,
+          :jobs_enabled,
+          :merge_requests_enabled,
+          :wiki_enabled,
+          :jobs_enabled,
+          :snippets_enabled
         ]
       end
     end