diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-23 12:12:16 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-23 12:12:16 +0300 |
commit | e9c3815d3d3e8a9ba07b899c491db38ac621fe57 (patch) | |
tree | cf4fc0168e37a0b9376a729028b3c114cbe277d8 /app/assets/javascripts/runner | |
parent | bf1a77ead789527e185dcf7245f950e53b6a2f90 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/runner')
6 files changed, 8 insertions, 31 deletions
diff --git a/app/assets/javascripts/runner/components/registration/registration_token_reset_dropdown_item.vue b/app/assets/javascripts/runner/components/registration/registration_token_reset_dropdown_item.vue index 54c35e483dc..e65d30afee1 100644 --- a/app/assets/javascripts/runner/components/registration/registration_token_reset_dropdown_item.vue +++ b/app/assets/javascripts/runner/components/registration/registration_token_reset_dropdown_item.vue @@ -98,17 +98,14 @@ export default { }, onError(error) { const { message } = error; - createAlert({ message }); - this.reportToSentry(error); + createAlert({ message }); + captureException({ error, component: this.$options.name }); }, onSuccess(token) { this.$toast?.show(s__('Runners|New registration token generated!')); this.$emit('tokenReset', token); }, - reportToSentry(error) { - captureException({ error, component: this.$options.name }); - }, }, }; </script> diff --git a/app/assets/javascripts/runner/components/runner_delete_button.vue b/app/assets/javascripts/runner/components/runner_delete_button.vue index 0ff1f93b1df..4a508c64214 100644 --- a/app/assets/javascripts/runner/components/runner_delete_button.vue +++ b/app/assets/javascripts/runner/components/runner_delete_button.vue @@ -116,11 +116,8 @@ export default { }, onError(error) { const { message } = error; - createAlert({ message }); - this.reportToSentry(error); - }, - reportToSentry(error) { + createAlert({ message }); captureException({ error, component: this.$options.name }); }, }, diff --git a/app/assets/javascripts/runner/components/runner_jobs.vue b/app/assets/javascripts/runner/components/runner_jobs.vue index c13e7e90168..f9804ed815a 100644 --- a/app/assets/javascripts/runner/components/runner_jobs.vue +++ b/app/assets/javascripts/runner/components/runner_jobs.vue @@ -46,7 +46,7 @@ export default { }, error(error) { createAlert({ message: I18N_FETCH_ERROR }); - this.reportToSentry(error); + captureException({ error, component: this.$options.name }); }, }, }, @@ -62,11 +62,6 @@ export default { return this.$apollo.queries.jobs.loading; }, }, - methods: { - reportToSentry(error) { - captureException({ error, component: this.$options.name }); - }, - }, I18N_NO_JOBS_FOUND, }; </script> diff --git a/app/assets/javascripts/runner/components/runner_pause_button.vue b/app/assets/javascripts/runner/components/runner_pause_button.vue index a8b259f5b90..3ea2006d17a 100644 --- a/app/assets/javascripts/runner/components/runner_pause_button.vue +++ b/app/assets/javascripts/runner/components/runner_pause_button.vue @@ -92,11 +92,8 @@ export default { }, onError(error) { const { message } = error; - createAlert({ message }); - this.reportToSentry(error); - }, - reportToSentry(error) { + createAlert({ message }); captureException({ error, component: this.$options.name }); }, }, diff --git a/app/assets/javascripts/runner/components/runner_projects.vue b/app/assets/javascripts/runner/components/runner_projects.vue index c4065a24ff2..2040b39e948 100644 --- a/app/assets/javascripts/runner/components/runner_projects.vue +++ b/app/assets/javascripts/runner/components/runner_projects.vue @@ -55,8 +55,7 @@ export default { }, error(error) { createAlert({ message: I18N_FETCH_ERROR }); - - this.reportToSentry(error); + captureException({ error, component: this.$options.name }); }, }, }, @@ -77,11 +76,6 @@ export default { }); }, }, - methods: { - reportToSentry(error) { - captureException({ error, component: this.$options.name }); - }, - }, I18N_NONE, }; </script> diff --git a/app/assets/javascripts/runner/components/runner_update_form.vue b/app/assets/javascripts/runner/components/runner_update_form.vue index e3deb94236e..abff3e59407 100644 --- a/app/assets/javascripts/runner/components/runner_update_form.vue +++ b/app/assets/javascripts/runner/components/runner_update_form.vue @@ -82,9 +82,9 @@ export default { this.onSuccess(); } catch (error) { const { message } = error; - createAlert({ message }); - this.reportToSentry(error); + createAlert({ message }); + captureException({ error, component: this.$options.name }); } finally { this.saving = false; } @@ -93,9 +93,6 @@ export default { createAlert({ message: __('Changes saved.'), variant: VARIANT_SUCCESS }); this.model = runnerToModel(this.runner); }, - reportToSentry(error) { - captureException({ error, component: this.$options.name }); - }, }, ACCESS_LEVEL_NOT_PROTECTED, ACCESS_LEVEL_REF_PROTECTED, |