Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 1 deletions

diff --git a/app/assets/javascripts/templates/issuable_template_selector.js b/app/assets/javascripts/templates/issuable_template_selector.js
index 78a1c4fa8a8..10ad4170930 100644
--- a/app/assets/javascripts/templates/issuable_template_selector.js
+++ b/app/assets/javascripts/templates/issuable_template_selector.js
@@ -31,7 +31,8 @@ export default class IssuableTemplateSelector extends TemplateSelector {
     });
 
     this.templateWarningEl.find('.js-close-btn').on('click', () => {
-      if (this.previousSelectedIndex) {
+      // Explicitly check against 0 value
+      if (this.previousSelectedIndex !== undefined) {
         this.dropdown.data('glDropdown').selectRowAtIndex(this.previousSelectedIndex);
       } else {
         this.reset();
@@ -109,6 +110,7 @@ export default class IssuableTemplateSelector extends TemplateSelector {
     } else {
       this.setEditorContent(this.currentTemplate, { skipFocus: false });
     }
+
     return;
   }
 }