kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

added missing calls in catch statements

This commit is contained in:
Phil Hughes 2018-02-02 16:33:38 +00:00
parent 645d635976
commit 965ff9653d
No known key found for this signature in database
GPG Key ID: 32245528C52E0F9F
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js
View File

@ -53,6 +53,7 @@ $(() => {
}); });
}) })
.catch(() => { .catch(() => {
mergeConflictsStore.setLoadingState(false);
mergeConflictsStore.setFailedRequest(); mergeConflictsStore.setFailedRequest();
}); });
}, },

12
app/assets/javascripts/merge_request_tabs.js
View File

@ -2,7 +2,7 @@
import Cookies from 'js-cookie'; import Cookies from 'js-cookie';
import axios from './lib/utils/axios_utils'; import axios from './lib/utils/axios_utils';
import Flash from './flash'; import flash from './flash';
import BlobForkSuggestion from './blob/blob_fork_suggestion'; import BlobForkSuggestion from './blob/blob_fork_suggestion';
import initChangesDropdown from './init_changes_dropdown'; import initChangesDropdown from './init_changes_dropdown';
import bp from './breakpoints'; import bp from './breakpoints';
@ -257,7 +257,10 @@ export default class MergeRequestTabs {
this.toggleLoading(false); this.toggleLoading(false);
}) })
.catch(() => new Flash('An error occurred while fetching this tab.', 'alert')); .catch(() => {
this.toggleLoading(false);
flash('An error occurred while fetching this tab.');
});
} }
mountPipelinesView() { mountPipelinesView() {
@ -344,7 +347,10 @@ export default class MergeRequestTabs {
this.toggleLoading(false); this.toggleLoading(false);
}) })
.catch(() => Flash('An error occurred while fetching this tab.', 'alert')); .catch(() => {
this.toggleLoading(false);
flash('An error occurred while fetching this tab.');
});
} }
// Show or hide the loading spinner // Show or hide the loading spinner