diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-12 00:09:19 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-12 00:09:19 +0300 |
| commit | 5b650db2d66a6e1106b57d6db1d33e74e3c56906 (patch) | |
| tree | 1ec9a69b3bb13ed0baf0cc9033b75ddbf67d838e /app/assets/javascripts/vue_merge_request_widget | |
| parent | 76960690493db51cbbf3d24943f2fc6bb09e5ce4 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_list.vue | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/mr_collapsible_extension.vue | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_list.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_list.vue index 655acf28253..501f5f1523f 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_list.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_list.vue @@ -67,7 +67,6 @@ export default { v-for="deployment in deployments" :key="deployment.id" :class="deploymentClass" - class="gl-bg-gray-50" :deployment="deployment" :show-metrics="hasDeploymentMetrics" /> diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_collapsible_extension.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_collapsible_extension.vue index f8d2732b385..6475def461a 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_collapsible_extension.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_collapsible_extension.vue @@ -46,8 +46,8 @@ export default { }; </script> <template> - <div> - <div class="mr-widget-extension d-flex align-items-center pl-3"> + <div class="mr-widget-extension"> + <div class="d-flex align-items-center pl-3"> <div v-if="hasError" class="ci-widget media"> <div class="media-body"> <span class="gl-font-sm mr-widget-margin-left gl-line-height-24 js-error-state"> |