diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-02-27 01:07:17 +0300 |
|---|---|---|
| committer | Ian Baum <ibaum@gitlab.com> | 2018-03-07 01:19:39 +0300 |
| commit | d77353b8b12345c1d10e427f2fc2e5a3ba03eef3 (patch) | |
| tree | 1448bcdec9f32ba8b92b6cc45e735778c3df6b8f /changelogs | |
| parent | efefd65c809f92ae5880f4c9c5e2666137f65958 (diff) | |
Merge branch '43532-error-on-admin-applications-prometheus-template' into 'master'
Resolve "Error 500 on route "/admin/application_settings/services/1882/edit" -> edit Prometheus Service Template"
Closes #43532
See merge request gitlab-org/gitlab-ce!17377
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/43532-error-on-admin-applications-prometheus-template.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/43532-error-on-admin-applications-prometheus-template.yml b/changelogs/unreleased/43532-error-on-admin-applications-prometheus-template.yml new file mode 100644 index 00000000000..25bcbf2fbab --- /dev/null +++ b/changelogs/unreleased/43532-error-on-admin-applications-prometheus-template.yml @@ -0,0 +1,5 @@ +--- +title: Fixes Prometheus admin configuration page +merge_request: 17377 +author: +type: fixed |