diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2019-05-06 22:03:37 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2019-05-06 22:03:37 +0000 |
| commit | dfe59c75bf4d6f6937767ee9ef35df4ef42e7667 (patch) | |
| tree | 63e2f920b89e453800c92765f87503df2be77ddb | |
| parent | e1aa7f5074aab8190d16a6f25121d33b99a07238 (diff) | |
| parent | 35f52b63644c2ae3644b9beaf4cafee67e879434 (diff) | |
| download | gitlab-ce-dfe59c75bf4d6f6937767ee9ef35df4ef42e7667.tar.gz | |
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
3 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue index 287bdbcf873..73760da9b98 100644 --- a/app/assets/javascripts/clusters/components/applications.vue +++ b/app/assets/javascripts/clusters/components/applications.vue @@ -389,7 +389,6 @@ export default { </template> </application-row> <application-row - v-if="isProjectCluster" id="prometheus" :logo-url="prometheusLogo" :title="applications.prometheus.title" diff --git a/changelogs/unreleased/51963-support-prometheus-for-group-level-clusters.yml b/changelogs/unreleased/51963-support-prometheus-for-group-level-clusters.yml new file mode 100644 index 00000000000..ede2e242156 --- /dev/null +++ b/changelogs/unreleased/51963-support-prometheus-for-group-level-clusters.yml @@ -0,0 +1,5 @@ +--- +title: Support prometheus for group level clusters +merge_request: 27280 +author: +type: changed diff --git a/spec/frontend/clusters/components/applications_spec.js b/spec/frontend/clusters/components/applications_spec.js index 7c54a27d950..8bcf02f0a34 100644 --- a/spec/frontend/clusters/components/applications_spec.js +++ b/spec/frontend/clusters/components/applications_spec.js @@ -75,7 +75,7 @@ describe('Applications', () => { }); 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', () => { |