summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_shared/components/commit.vue
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-05-19 09:08:12 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-19 09:08:12 +0000
commit57d1bb82549c6713f87f87d5f35eec3d867c83db (patch)
tree22f708344121786e286fd318fbfbfda632200909 /app/assets/javascripts/vue_shared/components/commit.vue
parent4e81d9c050bfea4c866329155c17b929d7381340 (diff)
downloadgitlab-ce-57d1bb82549c6713f87f87d5f35eec3d867c83db.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared/components/commit.vue')
-rw-r--r--app/assets/javascripts/vue_shared/components/commit.vue2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_shared/components/commit.vue b/app/assets/javascripts/vue_shared/components/commit.vue
index 356f733fb8c..23bea6c28b4 100644
--- a/app/assets/javascripts/vue_shared/components/commit.vue
+++ b/app/assets/javascripts/vue_shared/components/commit.vue
@@ -4,7 +4,7 @@ import { GlTooltipDirective, GlLink } from '@gitlab/ui';
import { __, sprintf } from '~/locale';
import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue';
import UserAvatarLink from './user_avatar/user_avatar_link.vue';
-import Icon from '../../vue_shared/components/icon.vue';
+import Icon from './icon.vue';
export default {
directives: {