Skip to content

Commit d460d0a

Browse files
committed
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
2 parents 13bf010 + a3c3878 commit d460d0a

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

app/assets/javascripts/templates/issuable_template_selector.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ export default class IssuableTemplateSelector extends TemplateSelector {
3232
this.startLoadingSpinner();
3333
Api.issueTemplate(this.namespacePath, this.projectPath, query.name, this.issuableType, (err, currentTemplate) => {
3434
this.currentTemplate = currentTemplate;
35-
if (err) return; // Error handled by global AJAX error handler
3635
this.stopLoadingSpinner();
36+
if (err) return; // Error handled by global AJAX error handler
3737
this.setInputValueToTemplateContent();
3838
});
3939
return;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
title: Stop loading spinner on error of issuable templates
3+
merge_request: 16600
4+
author: Takuya Noguchi
5+
type: fixed

0 commit comments

Comments
 (0)