diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-06-17 15:53:28 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-06-17 15:53:28 +0000 |
| commit | 982d62a0452b2e806e363aa7be1f1a169227fc7f (patch) | |
| tree | 41084d4d668009f473af806698e2584e241a8a34 | |
| parent | 08ed6b1720ff4d6e2b45a97000a106071d650194 (diff) | |
| parent | fd1dc9726cdaa5f5105f06219bf2d2f19a77e4c0 (diff) | |
| download | gitlab-ce-982d62a0452b2e806e363aa7be1f1a169227fc7f.tar.gz | |
Merge branch 'ce-11981-show-merge-train-position' into 'master'
CE backport for gitlab-org/gitlab-ee!14064: Add merge train position indicator
See merge request gitlab-org/gitlab-ce!29561
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline_container.vue | 11 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 3 |
2 files changed, 13 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline_container.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline_container.vue index 03a15ba81ed..ba9a4d2a187 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline_container.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline_container.vue @@ -1,4 +1,5 @@ <script> +import _ from 'underscore'; import Deployment from './deployment.vue'; import MrWidgetContainer from './mr_widget_container.vue'; import MrWidgetPipeline from './mr_widget_pipeline.vue'; @@ -17,6 +18,8 @@ export default { Deployment, MrWidgetContainer, MrWidgetPipeline, + MergeTrainInfo: () => + import('ee_component/vue_merge_request_widget/components/merge_train_info.vue'), }, props: { mr: { @@ -58,6 +61,9 @@ export default { showVisualReviewAppLink() { return Boolean(this.mr.visualReviewFF && this.mr.visualReviewAppAvailable); }, + showMergeTrainInfo() { + return _.isNumber(this.mr.mergeTrainIndex); + }, }, }; </script> @@ -83,6 +89,11 @@ export default { :visual-review-app-meta="visualReviewAppMeta" /> </div> + <merge-train-info + v-if="showMergeTrainInfo" + class="mr-widget-extension" + :merge-train-index="mr.mergeTrainIndex" + /> </template> </mr-widget-container> </template> diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 8cb3fab74e0..3917937f4af 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -904,7 +904,8 @@ margin-right: -5px; } -.deploy-heading { +.deploy-heading, +.merge-train-info { @include media-breakpoint-up(md) { padding: $gl-padding-8 $gl-padding; } |