summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/diffs/components/commit_item.vue
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-08-24 15:10:11 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-08-24 15:10:11 +0000
commit27622f7417713cbd2057a7f642e9ce128d9fc169 (patch)
treea3d4f20076d48d61c5bbd92e2ae895bb069fe92a /app/assets/javascripts/diffs/components/commit_item.vue
parent4b9bde7848d9538c1635ffe7a5385ba013487b4a (diff)
downloadgitlab-ce-27622f7417713cbd2057a7f642e9ce128d9fc169.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/diffs/components/commit_item.vue')
-rw-r--r--app/assets/javascripts/diffs/components/commit_item.vue4
1 files changed, 1 insertions, 3 deletions
diff --git a/app/assets/javascripts/diffs/components/commit_item.vue b/app/assets/javascripts/diffs/components/commit_item.vue
index 274a4027e62..f8dab10822b 100644
--- a/app/assets/javascripts/diffs/components/commit_item.vue
+++ b/app/assets/javascripts/diffs/components/commit_item.vue
@@ -5,7 +5,6 @@ import { GlButtonGroup, GlButton, GlIcon, GlTooltipDirective } from '@gitlab/ui'
import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue';
-import Icon from '~/vue_shared/components/icon.vue';
import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
@@ -39,7 +38,6 @@ import { setUrlParams } from '../../lib/utils/url_utility';
export default {
components: {
UserAvatarLink,
- Icon,
ClipboardButton,
TimeAgoTooltip,
CommitPipelineStatus,
@@ -156,7 +154,7 @@ export default {
type="button"
:aria-label="__('Toggle commit description')"
>
- <icon :size="12" name="ellipsis_h" />
+ <gl-icon :size="12" name="ellipsis_h" />
</button>
<div class="committer">