Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

1 files changed, 14 insertions, 23 deletions

diff --git a/app/validators/json_schemas/security_ci_configuration_schemas/sast_ui_schema.json b/app/validators/json_schemas/security_ci_configuration_schemas/sast_ui_schema.json
index 7c3720dd2e6..20be49f9eae 100644
--- a/app/validators/json_schemas/security_ci_configuration_schemas/sast_ui_schema.json
+++ b/app/validators/json_schemas/security_ci_configuration_schemas/sast_ui_schema.json
@@ -18,15 +18,6 @@
             "value": "",
             "size": "MEDIUM",
             "description": "Comma-separated list of paths to be excluded from analyzer output. Patterns can be globs, file paths, or folder paths."
-        },
-        {
-            "field" : "SAST_ANALYZER_IMAGE_TAG",
-            "label" : "Image tag",
-            "type": "string",
-            "default_value": "",
-            "value": "",
-            "size": "SMALL",
-            "description": "Analyzer image's tag"
         }
     ],
     "pipeline": [
@@ -109,20 +100,6 @@
             ]
         },
         {
-            "name": "kubesec",
-            "label": "Kubesec",
-            "enabled" : true,
-            "description": "Kubernetes manifests, Helm Charts",
-            "variables": []
-        },
-        {
-            "name": "nodejs-scan",
-            "label": "Node.js Scan",
-            "enabled" : true,
-            "description": "Node.js",
-            "variables": []
-        },
-        {
             "name": "gosec",
             "label": "Gosec",
             "enabled" : true,
@@ -140,6 +117,20 @@
             ]
         },
         {
+            "name": "kubesec",
+            "label": "Kubesec",
+            "enabled" : true,
+            "description": "Kubernetes manifests, Helm Charts",
+            "variables": []
+        },
+        {
+            "name": "nodejs-scan",
+            "label": "Node.js Scan",
+            "enabled" : true,
+            "description": "Node.js",
+            "variables": []
+        },
+        {
             "name": "phpcs-security-audit",
             "label": "PHP Security Audit",
             "enabled" : true,