Add latest changes from gitlab-org/gitlab@15-9-stable-eev15.9.0-rc42

11 files changed, 17 insertions, 17 deletions

diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/custom_variable_full_syntax.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/custom_variable_full_syntax.json
index c40befcf8ce..0d9c217afd1 100644
--- a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/custom_variable_full_syntax.json
+++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/custom_variable_full_syntax.json
@@ -7,7 +7,7 @@
   "properties": {
     "type": { "enum": ["custom"] },
     "label": { "type": "string" },
-    "options": { "$ref": "spec/fixtures/lib/gitlab/metrics/dashboard/schemas/custom_variable_options.json" }
+    "options": { "$ref": "custom_variable_options.json" }
   },
   "additionalProperties": false
 }
diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/custom_variable_options.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/custom_variable_options.json
index de72b947eed..bb78294e43e 100644
--- a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/custom_variable_options.json
+++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/custom_variable_options.json
@@ -5,7 +5,7 @@
   "properties": {
     "values": {
       "type": "array",
-      "items": { "$ref": "spec/fixtures/lib/gitlab/metrics/dashboard/schemas/custom_variable_values.json" }
+      "items": { "$ref": "custom_variable_values.json" }
     }
   },
   "additionalProperties": false
diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/dashboard.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/dashboard.json
index 40453c61a65..f38f74ae13f 100644
--- a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/dashboard.json
+++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/dashboard.json
@@ -11,10 +11,10 @@
     "priority": { "type": "number" },
     "panel_groups": {
       "type": "array",
-      "items": { "$ref": "spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panel_groups.json" }
+      "items": { "$ref": "panel_groups.json" }
     },
-    "templating": { "$ref": "spec/fixtures/lib/gitlab/metrics/dashboard/schemas/templating.json" },
-    "links": { "$ref": "spec/fixtures/lib/gitlab/metrics/dashboard/schemas/links.json" }
+    "templating": { "$ref": "templating.json" },
+    "links": { "$ref": "links.json" }
   },
   "additionalProperties": false
 }
diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/embedded_dashboard.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/embedded_dashboard.json
index b47b81fc103..a5228bc0888 100644
--- a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/embedded_dashboard.json
+++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/embedded_dashboard.json
@@ -6,7 +6,7 @@
     "panel_groups": {
       "type": "array",
       "items": {
-        "$ref": "spec/fixtures/lib/gitlab/metrics/dashboard/schemas/embedded_panel_groups.json"
+        "$ref": "embedded_panel_groups.json"
       }
     }
   },
diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/embedded_panel_groups.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/embedded_panel_groups.json
index 063016c22fd..b1c34ba1b86 100644
--- a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/embedded_panel_groups.json
+++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/embedded_panel_groups.json
@@ -5,7 +5,7 @@
   "properties": {
     "panels": {
       "type": "array",
-      "items": { "$ref": "spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panels.json" }
+      "items": { "$ref": "panels.json" }
     }
   },
   "additionalProperties": false
diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/metric_label_values_variable_full_syntax.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/metric_label_values_variable_full_syntax.json
index 145cc476d64..742708e60bd 100644
--- a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/metric_label_values_variable_full_syntax.json
+++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/metric_label_values_variable_full_syntax.json
@@ -15,8 +15,8 @@
       "type": "string"
     },
     "options": {
-      "$ref": "spec/fixtures/lib/gitlab/metrics/dashboard/schemas/metric_label_values_variable_options.json"
+      "$ref": "metric_label_values_variable_options.json"
     }
   },
   "additionalProperties": false
-}
\ No newline at end of file
+}
diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panel_groups.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panel_groups.json
index 392aa0e4480..a5a4428f2f3 100644
--- a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panel_groups.json
+++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panel_groups.json
@@ -9,7 +9,7 @@
     "group": { "type": "string" },
     "panels": {
       "type": "array",
-      "items": { "$ref": "spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panels.json" }
+      "items": { "$ref": "panels.json" }
     },
     "has_custom_metrics": { "type": "boolean" }
   },
diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panels.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panels.json
index 3224e7cfe3f..78369a7a055 100644
--- a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panels.json
+++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/panels.json
@@ -11,11 +11,11 @@
     "id": { "type": "string" },
     "type": { "type": "string" },
     "y_label": { "type": "string" },
-    "y_axis": { "$ref": "spec/fixtures/lib/gitlab/metrics/dashboard/schemas/axis.json" },
+    "y_axis": { "$ref": "axis.json" },
     "max_value": { "type": "number" },
     "metrics": {
       "type": "array",
-      "items": { "$ref": "spec/fixtures/lib/gitlab/metrics/dashboard/schemas/metrics.json" }
+      "items": { "$ref": "metrics.json" }
     }
   },
   "additionalProperties": false
diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/templating.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/templating.json
index 439f7b6b044..c339edec128 100644
--- a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/templating.json
+++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/templating.json
@@ -3,7 +3,7 @@
   "type": "object",
   "required": ["variables"],
   "properties": {
-    "variables": { "$ref": "spec/fixtures/lib/gitlab/metrics/dashboard/schemas/variables.json" }
+    "variables": { "$ref": "variables.json" }
   },
   "additionalProperties": false
 }
diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/text_variable_full_syntax.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/text_variable_full_syntax.json
index c4382326854..37ff4fdba5f 100644
--- a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/text_variable_full_syntax.json
+++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/text_variable_full_syntax.json
@@ -7,7 +7,7 @@
   "properties": {
     "type": { "enum": ["text"] },
     "label": { "type": "string" },
-    "options": { "$ref": "spec/fixtures/lib/gitlab/metrics/dashboard/schemas/text_variable_options.json" }
+    "options": { "$ref": "text_variable_options.json" }
   },
   "additionalProperties": false
 }
diff --git a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/variables.json b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/variables.json
index 1cf5ae2eaa4..73841d5bd82 100644
--- a/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/variables.json
+++ b/spec/fixtures/lib/gitlab/metrics/dashboard/schemas/variables.json
@@ -4,14 +4,14 @@
   "patternProperties": {
     "^[a-zA-Z0-9_]*$": {
         "anyOf": [
-          { "$ref": "spec/fixtures/lib/gitlab/metrics/dashboard/schemas/text_variable_full_syntax.json" },
+          { "$ref": "text_variable_full_syntax.json" },
           { "type": "string" },
           {
             "type": "array",
             "items": { "type": "string" }
           },
-          { "$ref": "spec/fixtures/lib/gitlab/metrics/dashboard/schemas/custom_variable_full_syntax.json" },
-          { "$ref": "spec/fixtures/lib/gitlab/metrics/dashboard/schemas/metric_label_values_variable_full_syntax.json" }
+          { "$ref": "custom_variable_full_syntax.json" },
+          { "$ref": "metric_label_values_variable_full_syntax.json" }
         ]
       }
   },