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

BigW Consortium Gitlab

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