Add latest changes from gitlab-org/gitlab@master

2 files changed, 15 insertions, 9 deletions

diff --git a/app/assets/javascripts/alert_management/components/alert_details.vue b/app/assets/javascripts/alert_management/components/alert_details.vue
index 1f3fdd5eef2..ad29f5833e4 100644
--- a/app/assets/javascripts/alert_management/components/alert_details.vue
+++ b/app/assets/javascripts/alert_management/components/alert_details.vue
@@ -194,14 +194,20 @@ export default {
             projectPath: this.projectPath,
           },
         })
-        .then(({ data: { createAlertIssue: { errors, issue } } }) => {
-          if (errors?.length) {
-            [this.createIncidentError] = errors;
-            this.incidentCreationInProgress = false;
-          } else if (issue) {
-            visitUrl(this.incidentPath(issue.iid));
-          }
-        })
+        .then(
+          ({
+            data: {
+              createAlertIssue: { errors, issue },
+            },
+          }) => {
+            if (errors?.length) {
+              [this.createIncidentError] = errors;
+              this.incidentCreationInProgress = false;
+            } else if (issue) {
+              visitUrl(this.incidentPath(issue.iid));
+            }
+          },
+        )
         .catch(error => {
           this.createIncidentError = error;
           this.incidentCreationInProgress = false;
diff --git a/app/assets/javascripts/alert_management/components/sidebar/sidebar_assignees.vue b/app/assets/javascripts/alert_management/components/sidebar/sidebar_assignees.vue
index 3af68d42ddf..3b9a730e5e1 100644
--- a/app/assets/javascripts/alert_management/components/sidebar/sidebar_assignees.vue
+++ b/app/assets/javascripts/alert_management/components/sidebar/sidebar_assignees.vue
@@ -192,7 +192,7 @@ export default {
 </script>
 
 <template>
-  <div class="block alert-assignees ">
+  <div class="block alert-assignees">
     <div ref="assignees" class="sidebar-collapsed-icon" @click="$emit('toggle-sidebar')">
       <gl-icon name="user" :size="14" />
       <gl-loading-icon v-if="isUpdating" />