summaryrefslogtreecommitdiff
path: root/changelogs/unreleased/46413-error-when-prometheus-adapter-is-disabled.yml
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-05-23 15:28:14 +0000
committerMayra Cabrera <mcabrera@gitlab.com>2018-05-23 10:58:30 -0500
commitb2f54bc68f0469ad56b9f26b20e460f995300ea2 (patch)
tree6f0317a5debf9dee010145df3cb16e97f7eeac74 /changelogs/unreleased/46413-error-when-prometheus-adapter-is-disabled.yml
parent85167d25799ade8230d2a56a560a8d1a1920aa2b (diff)
downloadgitlab-ce-b2f54bc68f0469ad56b9f26b20e460f995300ea2.tar.gz
Merge branch '46413-error-when-prometheus-adapter-is-disabled' into 'master'
Render 404 when prometheus adapter is disabled in Prometheus metrics controller Closes #46413 See merge request gitlab-org/gitlab-ce!19110
Diffstat (limited to 'changelogs/unreleased/46413-error-when-prometheus-adapter-is-disabled.yml')
-rw-r--r--changelogs/unreleased/46413-error-when-prometheus-adapter-is-disabled.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/46413-error-when-prometheus-adapter-is-disabled.yml b/changelogs/unreleased/46413-error-when-prometheus-adapter-is-disabled.yml
new file mode 100644
index 00000000000..0d20f6aaf54
--- /dev/null
+++ b/changelogs/unreleased/46413-error-when-prometheus-adapter-is-disabled.yml
@@ -0,0 +1,5 @@
+---
+title: Render 404 when prometheus adapter is disabled in Prometheus metrics controller
+merge_request: 19110
+author:
+type: fixed