diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2019-01-22 21:53:08 +0100 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2019-01-30 23:18:16 +0100 |
| commit | 6243c04e20b480c8353ac820ac4eb7ea43b92718 (patch) | |
| tree | 552ffe3fe0b27a06cd2f70ce303eeaf36912ea7a /app/assets/javascripts/issue_show | |
| parent | 10649c49ab371cce3119ffcccfa4c3d479f79ae4 (diff) | |
| download | gitlab-ce-6243c04e20b480c8353ac820ac4eb7ea43b92718.tar.gz | |
Fix failing specs and lint errors.
Diffstat (limited to 'app/assets/javascripts/issue_show')
| -rw-r--r-- | app/assets/javascripts/issue_show/components/app.vue | 8 | ||||
| -rw-r--r-- | app/assets/javascripts/issue_show/components/description.vue | 7 |
2 files changed, 12 insertions, 3 deletions
diff --git a/app/assets/javascripts/issue_show/components/app.vue b/app/assets/javascripts/issue_show/components/app.vue index 0428e099279..72398cb547a 100644 --- a/app/assets/javascripts/issue_show/components/app.vue +++ b/app/assets/javascripts/issue_show/components/app.vue @@ -214,10 +214,16 @@ export default { }, updateStoreState() { - this.service.getData() + this.service + .getData() .then(res => res.data) .then(data => { this.store.updateState(data); + }) + .catch(() => { + const errMsg = `Error updating ${this.issuableType}`; + + window.Flash(errMsg); }); }, diff --git a/app/assets/javascripts/issue_show/components/description.vue b/app/assets/javascripts/issue_show/components/description.vue index 519012b7df9..56e873c6ba0 100644 --- a/app/assets/javascripts/issue_show/components/description.vue +++ b/app/assets/javascripts/issue_show/components/description.vue @@ -39,6 +39,7 @@ export default { lockVersion: { type: Number, required: false, + default: 0, }, }, data() { @@ -89,8 +90,10 @@ export default { } }, - taskListUpdateError({ errors, data }) { - createFlash('Someone edited this issue at the same time you did and we updated the issue description.'); + taskListUpdateError() { + createFlash( + 'Someone edited this issue at the same time you did and we updated the issue description.', + ); this.$emit('taskListUpdateFailed'); }, |