diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-24 18:10:11 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-24 18:10:11 +0300 |
commit | 27622f7417713cbd2057a7f642e9ce128d9fc169 (patch) | |
tree | a3d4f20076d48d61c5bbd92e2ae895bb069fe92a /app/assets/javascripts/custom_metrics | |
parent | 4b9bde7848d9538c1635ffe7a5385ba013487b4a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/custom_metrics')
-rw-r--r-- | app/assets/javascripts/custom_metrics/components/custom_metrics_form_fields.vue | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/app/assets/javascripts/custom_metrics/components/custom_metrics_form_fields.vue b/app/assets/javascripts/custom_metrics/components/custom_metrics_form_fields.vue index f5207b47f69..6f8455e4bcf 100644 --- a/app/assets/javascripts/custom_metrics/components/custom_metrics_form_fields.vue +++ b/app/assets/javascripts/custom_metrics/components/custom_metrics_form_fields.vue @@ -1,8 +1,14 @@ <script> -import { GlFormInput, GlLink, GlFormGroup, GlFormRadioGroup, GlLoadingIcon } from '@gitlab/ui'; +import { + GlFormInput, + GlLink, + GlFormGroup, + GlFormRadioGroup, + GlLoadingIcon, + GlIcon, +} from '@gitlab/ui'; import { debounce } from 'lodash'; import { __, s__ } from '~/locale'; -import Icon from '~/vue_shared/components/icon.vue'; import csrf from '~/lib/utils/csrf'; import axios from '~/lib/utils/axios_utils'; import statusCodes from '~/lib/utils/http_status'; @@ -37,7 +43,7 @@ export default { GlFormGroup, GlFormRadioGroup, GlLoadingIcon, - Icon, + GlIcon, }, props: { formOperation: { @@ -229,7 +235,7 @@ export default { {{ s__('Metrics|Must be a valid PromQL query.') }} <gl-link href="https://prometheus.io/docs/prometheus/latest/querying/basics/" tabindex="-1"> {{ s__('Metrics|Prometheus Query Documentation') }} - <icon name="external-link" :size="12" /> + <gl-icon name="external-link" :size="12" /> </gl-link> </span> </gl-form-group> |