diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-10 21:09:15 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-10 21:09:15 +0300 |
| commit | f6905d2ed293ccde386ba2798e7a623c228e8f51 (patch) | |
| tree | 83e7defc9e9ec94462c3bc3d86e4ca0cbc4b7c21 /app/serializers | |
| parent | f2f748c08166ef350aa4183242c3611f6617f651 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/cluster_entity.rb | 1 | ||||
| -rw-r--r-- | app/serializers/cluster_serializer.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/serializers/cluster_entity.rb b/app/serializers/cluster_entity.rb index 4f53ea30544..8a1d41dbd96 100644 --- a/app/serializers/cluster_entity.rb +++ b/app/serializers/cluster_entity.rb @@ -8,6 +8,7 @@ class ClusterEntity < Grape::Entity expose :environment_scope expose :name expose :nodes + expose :provider_type expose :status_name, as: :status expose :status_reason expose :applications, using: ClusterApplicationEntity diff --git a/app/serializers/cluster_serializer.rb b/app/serializers/cluster_serializer.rb index f59b6a35a29..27156d3178f 100644 --- a/app/serializers/cluster_serializer.rb +++ b/app/serializers/cluster_serializer.rb @@ -13,6 +13,7 @@ class ClusterSerializer < BaseSerializer :name, :nodes, :path, + :provider_type, :status ] }) |