Add latest changes from gitlab-org/gitlab@master

2 files changed, 10 insertions, 1 deletions

diff --git a/app/assets/javascripts/incidents/components/incidents_list.vue b/app/assets/javascripts/incidents/components/incidents_list.vue
index ecd8acb449e..157e6f7b0ba 100644
--- a/app/assets/javascripts/incidents/components/incidents_list.vue
+++ b/app/assets/javascripts/incidents/components/incidents_list.vue
@@ -88,6 +88,7 @@ export default {
     'projectPath',
     'newIssuePath',
     'incidentTemplateName',
+    'incidentType',
     'issuePath',
     'publishedAvailable',
   ],
@@ -179,7 +180,13 @@ export default {
       };
     },
     newIncidentPath() {
-      return mergeUrlParams({ issuable_template: this.incidentTemplateName }, this.newIssuePath);
+      return mergeUrlParams(
+        {
+          issuable_template: this.incidentTemplateName,
+          'issue[issue_type]': this.incidentType,
+        },
+        this.newIssuePath,
+      );
     },
     availableFields() {
       return this.publishedAvailable
diff --git a/app/assets/javascripts/incidents/list.js b/app/assets/javascripts/incidents/list.js
index 3809742e32b..ac49ad63ad1 100644
--- a/app/assets/javascripts/incidents/list.js
+++ b/app/assets/javascripts/incidents/list.js
@@ -12,6 +12,7 @@ export default () => {
     projectPath,
     newIssuePath,
     incidentTemplateName,
+    incidentType,
     issuePath,
     publishedAvailable,
   } = domEl.dataset;
@@ -25,6 +26,7 @@ export default () => {
     provide: {
       projectPath,
       incidentTemplateName,
+      incidentType,
       newIssuePath,
       issuePath,
       publishedAvailable,