Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 4 deletions

diff --git a/app/assets/javascripts/vue_shared/components/clipboard_button.vue b/app/assets/javascripts/vue_shared/components/clipboard_button.vue
index 9f498037185..3ff1d9cf48a 100644
--- a/app/assets/javascripts/vue_shared/components/clipboard_button.vue
+++ b/app/assets/javascripts/vue_shared/components/clipboard_button.vue
@@ -12,8 +12,7 @@
  *    css-class="btn-transparent"
  * />
  */
-import { GlButton, GlTooltipDirective } from '@gitlab/ui';
-import Icon from '../components/icon.vue';
+import { GlButton, GlTooltipDirective, GlIcon } from '@gitlab/ui';
 
 export default {
   name: 'ClipboardButton',
@@ -22,7 +21,7 @@ export default {
   },
   components: {
     GlButton,
-    Icon,
+    GlIcon,
   },
   props: {
     text: {
@@ -72,6 +71,6 @@ export default {
     :title="title"
     :data-clipboard-text="clipboardText"
   >
-    <icon name="duplicate" />
+    <gl-icon name="copy-to-clipboard" />
   </gl-button>
 </template>