Merge branch 'fix-reset-template' into 'master'

Fix JS error when reseting new issue template Fixes JS error when trying to reset template when no template has been set. See merge request !7978

Merge branch 'fix-reset-template' into 'master'
6992ac11 · Fatih Acet · 162da9d3 · faf8f421 · 6992ac11
Commit 6992ac11 authored Dec 08, 2016 by Fatih Acet
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

template_selector.js.es6 app/assets/javascripts/blob/template_selector.js.es6 +2 -0

No files found.
--- a/app/assets/javascripts/blob/template_selector.js.es6
+++ b/app/assets/javascripts/blob/template_selector.js.es6
@@ -70,6 +70,8 @@
      // e.g.
      // Api.gitignoreText item.name, @requestFileSuccess.bind(@)
      requestFileSuccess(file, { skipFocus } = {}) {
+        if (!file) return;
+
        const oldValue = this.editor.getValue();
        let newValue = file.content;