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/grafana_integration | |
parent | 4b9bde7848d9538c1635ffe7a5385ba013487b4a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/grafana_integration')
-rw-r--r-- | app/assets/javascripts/grafana_integration/components/grafana_integration.vue | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/assets/javascripts/grafana_integration/components/grafana_integration.vue b/app/assets/javascripts/grafana_integration/components/grafana_integration.vue index 59327e36f5f..79494cb173b 100644 --- a/app/assets/javascripts/grafana_integration/components/grafana_integration.vue +++ b/app/assets/javascripts/grafana_integration/components/grafana_integration.vue @@ -1,7 +1,6 @@ <script> -import { GlButton, GlFormGroup, GlFormInput, GlFormCheckbox } from '@gitlab/ui'; +import { GlButton, GlFormGroup, GlFormInput, GlFormCheckbox, GlIcon } from '@gitlab/ui'; import { mapState, mapActions } from 'vuex'; -import Icon from '~/vue_shared/components/icon.vue'; export default { components: { @@ -9,7 +8,7 @@ export default { GlFormCheckbox, GlFormGroup, GlFormInput, - Icon, + GlIcon, }, data() { return { placeholderUrl: 'https://my-url.grafana.net/' }; @@ -89,7 +88,7 @@ export default { rel="noopener noreferrer" > {{ __('More information') }} - <icon name="external-link" class="vertical-align-middle" /> + <gl-icon name="external-link" class="vertical-align-middle" /> </a> </p> </gl-form-group> |