summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2019-04-05 09:21:08 +0000
committerSean McGivern <sean@gitlab.com>2019-04-05 09:21:08 +0000
commit5b273d355f47baa27b365e22b96a07187c78e1a7 (patch)
tree817e1bf2e3e9ac677ed7735b9df06c7c72d52359 /changelogs
parenteff97941248e1a8fc3a693325eb1267ea196adda (diff)
parent20594de8cc3311ddc53b29ffdf60bcf4a580a5b3 (diff)
downloadgitlab-ce-5b273d355f47baa27b365e22b96a07187c78e1a7.tar.gz
Merge branch '58375-api-controller' into 'master'
Add a prometheus proxy API per environment Closes #58375 See merge request gitlab-org/gitlab-ce!26841
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/58375-api-controller.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/58375-api-controller.yml b/changelogs/unreleased/58375-api-controller.yml
new file mode 100644
index 00000000000..60f21b37ae7
--- /dev/null
+++ b/changelogs/unreleased/58375-api-controller.yml
@@ -0,0 +1,5 @@
+---
+title: Add a Prometheus API per environment
+merge_request: 26841
+author:
+type: added