diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-05-05 13:50:03 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-05-05 13:50:03 +0000 |
| commit | 10c1bf2d77fd0ab21309d0b136cbc0ac11f56c77 (patch) | |
| tree | b171476c60bec5cacffbf1b65b09f83c8d6ce44f /changelogs | |
| parent | faf2ce89cd4eafdccb78823cf1a32c338a8d9a79 (diff) | |
| parent | 6eb9e981c61969a904ccbae2c5f52f562b02d199 (diff) | |
| download | gitlab-ce-10c1bf2d77fd0ab21309d0b136cbc0ac11f56c77.tar.gz | |
Merge branch 'prometheus-integration-test-setting-fix' into 'master'
Added rescue block for the test method for the prometheus service
Closes #31451
See merge request !10994
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/prometheus-integration-test-setting-fix.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/changelogs/unreleased/prometheus-integration-test-setting-fix.yml b/changelogs/unreleased/prometheus-integration-test-setting-fix.yml new file mode 100644 index 00000000000..45b7c2263e6 --- /dev/null +++ b/changelogs/unreleased/prometheus-integration-test-setting-fix.yml @@ -0,0 +1,4 @@ +--- +title: Prevent 500 errors caused by testing the Prometheus service +merge_request: 10994 +author: |