Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-06-01 10:58:18 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-06-01 10:58:18 +0300
commitd68ded2122f899bc0f478253652c4a082c98ec60 (patch)
tree945c0cd65b78b25c2302ff7eed254367a3f5ecf9 /spec/fixtures
parent83510980497ca72eb43fa9540be7abcbb6e811fc (diff)
parent69e9e957318f8c803461dc3bec7fc04d3ad50a72 (diff)
Merge branch '46487-add-support-for-jupyter-in-gitlab-via-kubernetes' into 'master'
Resolve "Add support for Jupyter in GitLab via Kubernetes" Closes #46487 See merge request gitlab-org/gitlab-ce!19019
Diffstat (limited to 'spec/fixtures')
-rw-r--r--spec/fixtures/api/schemas/cluster_status.json3
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/fixtures/api/schemas/cluster_status.json b/spec/fixtures/api/schemas/cluster_status.json
index d27c12e43f2..ccef17a6615 100644
--- a/spec/fixtures/api/schemas/cluster_status.json
+++ b/spec/fixtures/api/schemas/cluster_status.json
@@ -31,7 +31,8 @@
}
},
"status_reason": { "type": ["string", "null"] },
- "external_ip": { "type": ["string", "null"] }
+ "external_ip": { "type": ["string", "null"] },
+ "hostname": { "type": ["string", "null"] }
},
"required" : [ "name", "status" ]
}