Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 1 deletions

diff --git a/app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue b/app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue
index 5ffaebae6fd..a5f7b84446f 100644
--- a/app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue
+++ b/app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue
@@ -255,7 +255,7 @@ export default {
       if (this.showMappingBuilder) {
         this.resetPayloadAndMappingConfirmed = false;
         this.parsedPayload = payloadAlertFields;
-        this.samplePayload.json = this.isValidNonEmptyJSON(payloadExample) ? payloadExample : null;
+        this.samplePayload.json = this.getPrettifiedPayload(payloadExample);
         this.updateMapping(this.getCleanMapping(payloadAttributeMappings));
       }
       this.$el.scrollIntoView({ block: 'center' });
@@ -288,6 +288,11 @@ export default {
       }
       return false;
     },
+    getPrettifiedPayload(payload) {
+      return this.isValidNonEmptyJSON(payload)
+        ? JSON.stringify(JSON.parse(payload), null, '\t')
+        : null;
+    },
     triggerValidation() {
       if (this.isHttp) {
         this.validationState.apiUrl = true;