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-12-07 23:10:15 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-12-07 23:10:15 +0300
commitf689b1612e85cfba1665842f3b74b5cf446a9422 (patch)
tree34ab12101c7514a29da48fac91e9eee1e72c0a4d /spec/fixtures
parentd5994552b2088c0c27e419b3ae2c4432ea329a82 (diff)
parentccda026f61c77c8918b04361c8622be7c2fcb859 (diff)
Merge branch 'cert-manager-email' into 'master'
Ability to override Issuer Email for Cert Manager See merge request gitlab-org/gitlab-ce!23503
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 ccef17a6615..3d9e0628f63 100644
--- a/spec/fixtures/api/schemas/cluster_status.json
+++ b/spec/fixtures/api/schemas/cluster_status.json
@@ -32,7 +32,8 @@
},
"status_reason": { "type": ["string", "null"] },
"external_ip": { "type": ["string", "null"] },
- "hostname": { "type": ["string", "null"] }
+ "hostname": { "type": ["string", "null"] },
+ "email": { "type": ["string", "null"] }
},
"required" : [ "name", "status" ]
}