diff options
author | Rémy Coutable <remy@rymai.me> | 2018-05-23 18:28:14 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-05-23 18:28:14 +0300 |
commit | 83796a718d097114c6848b0c24fa45d96c4499d2 (patch) | |
tree | 9a211106836d34cf4e7c077ec0f6d4fd8d4996e3 /changelogs | |
parent | a2dbca4a27b8f380652bf1165f89238895b0f5d8 (diff) | |
parent | 58313de43091a535b2e540d77e5d863bbd5021f1 (diff) |
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')
-rw-r--r-- | changelogs/unreleased/46413-error-when-prometheus-adapter-is-disabled.yml | 5 |
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 |