spec/controllers/projects/prometheus/metrics_controller_spec.rb · 642a9adb6d8a34886a5e22f6d6f5b948af0ec472 · nexedi / gitlab-ce · GitLab

Find file Blame History Permalink

Merge remote-tracking branch 'upstream/master' into 5029-support-cluster-metrics · 642a9adb
Pawel Chojnacki authored Mar 07, 2018
```
# Conflicts:
#	spec/controllers/projects/prometheus/metrics_controller_spec.rb
#	spec/models/concerns/prometheus_adapter_spec.rb
```
642a9adb

metrics_controller_spec.rb 2.03 KB