diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:09:34 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:09:34 +0300 |
commit | c780abc85fd718ffa4f922aa9db826543fd49d36 (patch) | |
tree | 499d968986370fe898962c0b3a99f3f48b804985 /app/assets/javascripts/cycle_analytics | |
parent | a7608a4940a91e14754d56a7acbe496321fed99c (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/cycle_analytics')
-rw-r--r-- | app/assets/javascripts/cycle_analytics/components/stage_review_component.vue | 5 |
1 files changed, 4 insertions, 1 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 d61e6995551..2348e0719ca 100644 --- a/app/assets/javascripts/cycle_analytics/components/stage_review_component.vue +++ b/app/assets/javascripts/cycle_analytics/components/stage_review_component.vue @@ -3,6 +3,7 @@ import userAvatarImage from '../../vue_shared/components/user_avatar/user_avatar import limitWarning from './limit_warning_component.vue'; import totalTime from './total_time_component.vue'; import icon from '../../vue_shared/components/icon.vue'; +import { GlIcon } from '@gitlab/ui'; export default { components: { @@ -10,6 +11,7 @@ export default { totalTime, limitWarning, icon, + GlIcon, }, props: { items: { @@ -52,7 +54,8 @@ export default { </span> <template v-if="mergeRequest.state === 'closed'"> <span class="merge-request-state"> - <i class="fa fa-ban" aria-hidden="true"> </i> {{ mergeRequest.state.toUpperCase() }} + <gl-icon name="cancel" class="gl-vertical-align-text-bottom" /> + {{ __('CLOSED') }} </span> </template> <template v-else> |