app/models/clusters/applications/prometheus.rb · 20e9b32c96a5b08e3f61c8974b43977f98d8666e · Forest Godfrey / gitlab-ce · GitLab

BigW Consortium Gitlab

Blame History Permalink

Merge remote-tracking branch 'upstream/master' into 5029-support-cluster-metrics-ce · 4ff8db0d
Pawel Chojnacki authored Mar 06, 2018
```
# Conflicts:
#	spec/models/clusters/applications/prometheus_spec.rb
```
4ff8db0d

prometheus.rb 1.5 KB