diff options
author | Kamil TrzciĆski <ayufan@ayufan.eu> | 2018-01-15 16:31:10 +0000 |
---|---|---|
committer | Luke Bennett <lbennett@gitlab.com> | 2018-01-17 16:01:06 +0000 |
commit | 6671e32810a955511e3344e81b679b68b6b3c583 (patch) | |
tree | c98f2b3fd095340b3567d8b2c54e6d081b693477 /app/models/route.rb | |
parent | 6437ce71e9c08ad45cd7d0c78d03b853124d878f (diff) | |
download | gitlab-ce-6671e32810a955511e3344e81b679b68b6b3c583.tar.gz |
Merge branch '41799-managed-prometheus-deployment-install-a-lot-of-extra-stuff' into 'master'
Resolve "Managed Prometheus deployment installs a lot of extra stuff"
Closes #41799
See merge request gitlab-org/gitlab-ce!16378
(cherry picked from commit 5c51cbca06b099427e15309b352d01d960f641e3)
37d96e7d Use ConfigMap content to populate values.yaml
0a69f490 Fixes suggestions on MR
Diffstat (limited to 'app/models/route.rb')
0 files changed, 0 insertions, 0 deletions