Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42

1 files changed, 10 insertions, 0 deletions

diff --git a/lib/api/helpers/projects_helpers.rb b/lib/api/helpers/projects_helpers.rb
index 8c20f5b8fc2..0364ba2ad9e 100644
--- a/lib/api/helpers/projects_helpers.rb
+++ b/lib/api/helpers/projects_helpers.rb
@@ -83,9 +83,18 @@ module API
       params :optional_filter_params_ee do
       end
 
+      params :optional_update_params_ce do
+        optional :ci_forward_deployment_enabled, type: Boolean, desc: 'Skip older deployment jobs that are still pending'
+      end
+
       params :optional_update_params_ee do
       end
 
+      params :optional_update_params do
+        use :optional_update_params_ce
+        use :optional_update_params_ee
+      end
+
       params :optional_container_expiration_policy_params do
         optional :cadence, type: String, desc: 'Container expiration policy cadence for recurring job'
         optional :keep_n, type: String, desc: 'Container expiration policy number of images to keep'
@@ -108,6 +117,7 @@ module API
           :builds_access_level,
           :ci_config_path,
           :ci_default_git_depth,
+          :ci_forward_deployment_enabled,
           :container_registry_enabled,
           :container_expiration_policy_attributes,
           :default_branch,