summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/assets/javascripts/templates/issuable_template_selector.js2
-rw-r--r--changelogs/unreleased/40029-better-error-handling-on-issuable-templates.yml5
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