Add latest changes from gitlab-org/gitlab@master

1 files changed, 11 insertions, 1 deletions

diff --git a/app/assets/javascripts/editor/schema/ci.json b/app/assets/javascripts/editor/schema/ci.json
index 1fb68394912..63c1ccb36da 100644
--- a/app/assets/javascripts/editor/schema/ci.json
+++ b/app/assets/javascripts/editor/schema/ci.json
@@ -944,7 +944,8 @@
     },
     "workflowAutoCancel": {
       "type": "object",
-      "markdownDescription": "Define the rules for when pipeline should be automatically cancelled.",
+      "description": "Define the rules for when pipeline should be automatically cancelled.",
+      "additionalProperties": false,
       "properties": {
         "on_job_failure": {
           "markdownDescription": "Define which jobs to stop after a job fails.",
@@ -954,6 +955,15 @@
             "none",
             "all"
           ]
+        },
+        "on_new_commit": {
+          "markdownDescription": "Configure the behavior of the auto-cancel redundant pipelines feature. [Learn More](https://docs.gitlab.com/ee/ci/yaml/#workflowauto_cancelon_new_commit)",
+          "type": "string",
+          "enum": [
+            "conservative",
+            "interruptible",
+            "none"
+          ]
         }
       }
     },