diff options
| author | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-10-03 09:46:11 -0500 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-10-03 09:46:11 -0500 |
| commit | 3130262e880efd4f0df9dd2c62fa0fd23934b0e7 (patch) | |
| tree | cc07669a4b6f2e8da20675acf80b2ea58b0920fe /app/assets/javascripts/cycle_analytics/components/stage_review_component.vue | |
| parent | c14617709498eebef1755ee67c51f6e428ebbbce (diff) | |
| parent | 18fee3060c78e032777b5dc6b3d1f60432446ea5 (diff) | |
| download | gitlab-ce-3130262e880efd4f0df9dd2c62fa0fd23934b0e7.tar.gz | |
Merge branch 'master' into 38031-monitoring-hover-info-is-clipped38031-monitoring-hover-info-is-clipped
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, 4 insertions, 0 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 9e66b690404..f54ea7df522 100644 --- a/app/assets/javascripts/cycle_analytics/components/stage_review_component.vue +++ b/app/assets/javascripts/cycle_analytics/components/stage_review_component.vue @@ -1,5 +1,7 @@ <script> 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'; export default { props: { @@ -8,6 +10,8 @@ }, components: { userAvatarImage, + totalTime, + limitWarning, }, }; </script> |