diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-14 15:09:34 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-14 15:09:34 +0300 |
commit | 9a5dcad39c5dd81384ae4ec2398435883b944363 (patch) | |
tree | 3c684d30e4500028299d7948171e885b844a1ade /app/assets/javascripts/incidents_settings | |
parent | 0923a94d58cdd15cdb6379330e5eb41d30ccb8cc (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/incidents_settings')
-rw-r--r-- | app/assets/javascripts/incidents_settings/components/alerts_form.vue | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/incidents_settings/components/alerts_form.vue b/app/assets/javascripts/incidents_settings/components/alerts_form.vue index 85a8241789d..31b12e5d4f0 100644 --- a/app/assets/javascripts/incidents_settings/components/alerts_form.vue +++ b/app/assets/javascripts/incidents_settings/components/alerts_form.vue @@ -6,7 +6,7 @@ import { GlIcon, GlFormGroup, GlFormCheckbox, - GlNewDropdown, + GlDropdown, GlNewDropdownItem, } from '@gitlab/ui'; import { @@ -24,7 +24,7 @@ export default { GlFormGroup, GlIcon, GlFormCheckbox, - GlNewDropdown, + GlDropdown, GlNewDropdownItem, }, inject: ['service', 'alertSettings'], @@ -101,7 +101,7 @@ export default { <gl-icon name="question" :size="12" /> </gl-link> </label> - <gl-new-dropdown + <gl-dropdown id="alert-integration-settings-issue-template" data-qa-selector="incident_templates_dropdown" :text="issueTemplateHeader" @@ -117,7 +117,7 @@ export default { > {{ template.name }} </gl-new-dropdown-item> - </gl-new-dropdown> + </gl-dropdown> </gl-form-group> <gl-form-group class="gl-pl-0 gl-mb-5"> |