diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-03-01 20:38:04 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-03-01 20:38:04 +0300 |
| commit | ccb080d94aa765d8391f262e25c5ead0764dc2ff (patch) | |
| tree | 643e50759d3d92617606850ac987507c0ed59774 /app/serializers | |
| parent | 52e133d17627396f29c1875b972534eaba4a837e (diff) | |
| parent | ebac9c81ad1e859afe73482dd6f112b141cf9ede (diff) | |
Merge branch '42643-persist-external-ip-of-ingress-controller-gke' into 'master'
Display ingress IP address in the Kubernetes page
See merge request gitlab-org/gitlab-ce!17052
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/cluster_application_entity.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/serializers/cluster_application_entity.rb b/app/serializers/cluster_application_entity.rb index 3f9a275ad08..b22a0b666ef 100644 --- a/app/serializers/cluster_application_entity.rb +++ b/app/serializers/cluster_application_entity.rb @@ -2,4 +2,5 @@ class ClusterApplicationEntity < Grape::Entity expose :name expose :status_name, as: :status expose :status_reason + expose :external_ip, if: -> (e, _) { e.respond_to?(:external_ip) } end |