diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-16 12:09:28 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-16 12:09:28 +0300 |
| commit | 9c7b3812a22465b77ee24657ad1b446b81ffbc74 (patch) | |
| tree | 7185947a0d6528af2779209a62cafc17f1a8a243 /app/assets/javascripts/alerts_settings | |
| parent | 000087abd5a11442a7e34b0e5f3bf86cb40fa8e4 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/alerts_settings')
| -rw-r--r-- | app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue b/app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue index 6d1fc29ff84..6e7da070bbc 100644 --- a/app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue +++ b/app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue @@ -203,8 +203,7 @@ export default { } return { ...el, disabled: false }; }); - const [selected] = this.options; - this.selectedEndpoint = selected.value; + this.selectedEndpoint = this.options.find(({ value }) => value === 'opsgenie').value; if (this.targetUrl === null) { this.targetUrl = this.selectedService.targetUrl; } @@ -497,7 +496,7 @@ export default { > <template #append> <clipboard-button - :text="selectedService.authKey" + :text="selectedService.authKey || ''" :title="$options.i18n.copyToClipboard" class="gl-m-0!" /> |