diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2018-03-05 14:44:27 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2018-03-05 14:44:27 +0000 |
| commit | 5492ea1733318f405fe17cc24bced4be188d98c5 (patch) | |
| tree | c52023a01a9acd29df5a03870474bb54346befe3 | |
| parent | 80cbaf539f313596c307d8e485df4f11afda31ba (diff) | |
| parent | bb216e2b7cb15054381211844103d29c60f15424 (diff) | |
| download | gitlab-ce-5492ea1733318f405fe17cc24bced4be188d98c5.tar.gz | |
Merge branch '43837-error-handle-in-updating-milestone-on-issue' into 'master'
Loading spinner not stop even on errors in updating Milestone on Issue
Closes #43837
See merge request gitlab-org/gitlab-ce!17507
| -rw-r--r-- | app/assets/javascripts/milestone_select.js | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/43837-error-handle-in-updating-milestone-on-issue.yml | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/app/assets/javascripts/milestone_select.js b/app/assets/javascripts/milestone_select.js index 2841ecb558b..c259d5405bd 100644 --- a/app/assets/javascripts/milestone_select.js +++ b/app/assets/javascripts/milestone_select.js @@ -216,6 +216,9 @@ export default class MilestoneSelect { $value.html(milestoneLinkNoneTemplate); return $sidebarCollapsedValue.find('span').text('No'); } + }) + .catch(() => { + $loading.fadeOut(); }); } } diff --git a/changelogs/unreleased/43837-error-handle-in-updating-milestone-on-issue.yml b/changelogs/unreleased/43837-error-handle-in-updating-milestone-on-issue.yml new file mode 100644 index 00000000000..526523964c3 --- /dev/null +++ b/changelogs/unreleased/43837-error-handle-in-updating-milestone-on-issue.yml @@ -0,0 +1,5 @@ +--- +title: Stop loading spinner on error of milestone update on issue +merge_request: 17507 +author: Takuya Noguchi +type: fixed |