Commit dfe59c75 authored by Fatih Acet's avatar Fatih Acet

Merge branch '51963-support-prometheus-for-group-level-clusters' into 'master'

Resolve "Support Prometheus for group-level clusters"

Closes #51963

See merge request gitlab-org/gitlab-ce!27280
parents e1aa7f50 35f52b63
...@@ -389,7 +389,6 @@ export default { ...@@ -389,7 +389,6 @@ export default {
</template> </template>
</application-row> </application-row>
<application-row <application-row
v-if="isProjectCluster"
id="prometheus" id="prometheus"
:logo-url="prometheusLogo" :logo-url="prometheusLogo"
:title="applications.prometheus.title" :title="applications.prometheus.title"
......
---
title: Support prometheus for group level clusters
merge_request: 27280
author:
type: changed
...@@ -75,7 +75,7 @@ describe('Applications', () => { ...@@ -75,7 +75,7 @@ describe('Applications', () => {
}); });
it('renders a row for Prometheus', () => { it('renders a row for Prometheus', () => {
expect(vm.$el.querySelector('.js-cluster-application-row-prometheus')).toBeNull(); expect(vm.$el.querySelector('.js-cluster-application-row-prometheus')).not.toBeNull();
}); });
it('renders a row for GitLab Runner', () => { it('renders a row for GitLab Runner', () => {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment