diff options
| author | Steve Azzopardi <steveazz@outlook.com> | 2018-11-08 09:02:16 +0100 |
|---|---|---|
| committer | Steve Azzopardi <steveazz@outlook.com> | 2018-11-08 09:02:16 +0100 |
| commit | 7a6cae01c80dda564726ef363191b09d359ec2ba (patch) | |
| tree | 6f526b998098cd43ce88087467923991735d3c6a /app/assets/javascripts/projects/tree/components/commit_pipeline_status_component.vue | |
| parent | 7c4546a1161cd4cd5371f988f62c2e11812e54e6 (diff) | |
| parent | 15e519451e843b6d55a2c35bbefe039003b15c25 (diff) | |
| download | gitlab-ce-7a6cae01c80dda564726ef363191b09d359ec2ba.tar.gz | |
Merge branch 'master' into 11-5-stable-prepare-rc4
Diffstat (limited to 'app/assets/javascripts/projects/tree/components/commit_pipeline_status_component.vue')
| -rw-r--r-- | app/assets/javascripts/projects/tree/components/commit_pipeline_status_component.vue | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/projects/tree/components/commit_pipeline_status_component.vue b/app/assets/javascripts/projects/tree/components/commit_pipeline_status_component.vue index 120b4fc2f2b..9a729ca9b91 100644 --- a/app/assets/javascripts/projects/tree/components/commit_pipeline_status_component.vue +++ b/app/assets/javascripts/projects/tree/components/commit_pipeline_status_component.vue @@ -5,6 +5,7 @@ import Poll from '~/lib/utils/poll'; import Flash from '~/flash'; import { s__, sprintf } from '~/locale'; import tooltip from '~/vue_shared/directives/tooltip'; +import { GlLoadingIcon } from '@gitlab-org/gitlab-ui'; import CommitPipelineService from '../services/commit_pipeline_service'; export default { @@ -13,6 +14,7 @@ export default { }, components: { ciIcon, + GlLoadingIcon, }, props: { endpoint: { |