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/cycle_analytics/components/stage_review_component.vue | |
parent | 4b9bde7848d9538c1635ffe7a5385ba013487b4a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/cycle_analytics/components/stage_review_component.vue')
-rw-r--r-- | app/assets/javascripts/cycle_analytics/components/stage_review_component.vue | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/assets/javascripts/cycle_analytics/components/stage_review_component.vue b/app/assets/javascripts/cycle_analytics/components/stage_review_component.vue index dc13f409462..33b4e649ab0 100644 --- a/app/assets/javascripts/cycle_analytics/components/stage_review_component.vue +++ b/app/assets/javascripts/cycle_analytics/components/stage_review_component.vue @@ -3,14 +3,12 @@ import { GlIcon } from '@gitlab/ui'; import userAvatarImage from '../../vue_shared/components/user_avatar/user_avatar_image.vue'; import limitWarning from './limit_warning_component.vue'; import totalTime from './total_time_component.vue'; -import icon from '../../vue_shared/components/icon.vue'; export default { components: { userAvatarImage, totalTime, limitWarning, - icon, GlIcon, }, props: { @@ -60,7 +58,7 @@ export default { </template> <template v-else> <span v-if="mergeRequest.branch" class="merge-request-branch"> - <icon :size="16" name="fork" /> + <gl-icon :size="16" name="fork" /> <a :href="mergeRequest.branch.url"> {{ mergeRequest.branch.name }} </a> </span> </template> |