diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-12-08 20:07:10 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-12-08 20:07:10 +0000 |
| commit | 6992ac111713be14b050a72a462eb70d9be35ebc (patch) | |
| tree | 3bda624070b42f5fc0ba4b8688ebf880bd1d98c5 | |
| parent | 162da9d38b66a0a389af70a78575e8f9e5273975 (diff) | |
| parent | faf8f421103194be9af09dd8d24c582437bb7d2f (diff) | |
| download | gitlab-ce-6992ac111713be14b050a72a462eb70d9be35ebc.tar.gz | |
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
| -rw-r--r-- | app/assets/javascripts/blob/template_selector.js.es6 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/blob/template_selector.js.es6 b/app/assets/javascripts/blob/template_selector.js.es6 index 5434a19bcec..0ff5c0fab05 100644 --- 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; |