summaryrefslogtreecommitdiff
path: root/app/serializers/cluster_serializer.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-07-14 15:09:05 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-07-14 15:09:05 +0000
commit66bd1f0fdcaf84fa3412c70d7962b49eb8a48fde (patch)
tree23f451b4e60a6e28bcc15043d7756bb27dcc2970 /app/serializers/cluster_serializer.rb
parent49089d4fb1f5c17328ac61c955d95a68c6d4d545 (diff)
downloadgitlab-ce-66bd1f0fdcaf84fa3412c70d7962b49eb8a48fde.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/serializers/cluster_serializer.rb')
-rw-r--r--app/serializers/cluster_serializer.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/serializers/cluster_serializer.rb b/app/serializers/cluster_serializer.rb
index 27156d3178f..92363a4942c 100644
--- a/app/serializers/cluster_serializer.rb
+++ b/app/serializers/cluster_serializer.rb
@@ -10,6 +10,7 @@ class ClusterSerializer < BaseSerializer
:cluster_type,
:enabled,
:environment_scope,
+ :gitlab_managed_apps_logs_path,
:name,
:nodes,
:path,