diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-01-22 20:38:14 +0300 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-01-22 20:38:14 +0300 |
| commit | d460d0af9dcad90a7e7fdcdb4b65fdea1549c931 (patch) | |
| tree | f2857add409f52baa1aaaa84c077adb429562184 | |
| parent | 13bf010fe57e3a5e8e4b2b1a7df2d1206326c500 (diff) | |
| parent | a3c387895718b88c58bc89c193e5f6c285adbd43 (diff) | |
Merge branch '40029-better-error-handling-on-issuable-templates' into 'master'
Loading spinner not stop even on errors in the Issuable Templates
Closes #40029
See merge request gitlab-org/gitlab-ce!16600
| -rw-r--r-- | app/assets/javascripts/templates/issuable_template_selector.js | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/40029-better-error-handling-on-issuable-templates.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/templates/issuable_template_selector.js b/app/assets/javascripts/templates/issuable_template_selector.js index 8e167f5bf08..4cc1c96b870 100644 --- a/app/assets/javascripts/templates/issuable_template_selector.js +++ b/app/assets/javascripts/templates/issuable_template_selector.js @@ -32,8 +32,8 @@ export default class IssuableTemplateSelector extends TemplateSelector { this.startLoadingSpinner(); Api.issueTemplate(this.namespacePath, this.projectPath, query.name, this.issuableType, (err, currentTemplate) => { this.currentTemplate = currentTemplate; - if (err) return; // Error handled by global AJAX error handler this.stopLoadingSpinner(); + if (err) return; // Error handled by global AJAX error handler this.setInputValueToTemplateContent(); }); return; diff --git a/changelogs/unreleased/40029-better-error-handling-on-issuable-templates.yml b/changelogs/unreleased/40029-better-error-handling-on-issuable-templates.yml new file mode 100644 index 00000000000..519f411d642 --- /dev/null +++ b/changelogs/unreleased/40029-better-error-handling-on-issuable-templates.yml @@ -0,0 +1,5 @@ +--- +title: Stop loading spinner on error of issuable templates +merge_request: 16600 +author: Takuya Noguchi +type: fixed |