diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-11 03:08:02 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-11 03:08:02 +0300 |
| commit | cb2494484e33a0d3c750625908e8b4dda69ab7b4 (patch) | |
| tree | d3a4748bdb44b5ad7c1952c508dbb18230c45a7b /app/assets/javascripts/packages_and_registries | |
| parent | 8cd9a013792172f8d64eba8f327e2dadd71efffb (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/packages_and_registries')
2 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/list_page/cleanup_status.vue b/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/list_page/cleanup_status.vue index a720ad75570..3ae69731537 100644 --- a/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/list_page/cleanup_status.vue +++ b/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/list_page/cleanup_status.vue @@ -31,10 +31,10 @@ export default { ); }, }, - expirationPolicyNextRunAt: { - type: String, + expirationPolicy: { + type: Object, + default: () => ({}), required: false, - default: () => '', }, }, i18n: { @@ -54,7 +54,7 @@ export default { return this.$options.i18n[`CLEANUP_STATUS_${this.status}`]; }, calculatedTimeTilNextRun() { - return timeTilRun(this.expirationPolicyNextRunAt?.next_run); + return timeTilRun(this.expirationPolicy?.next_run); }, }, statusPopoverOptions: { diff --git a/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/list_page/image_list_row.vue b/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/list_page/image_list_row.vue index 12263c6fc5a..d76a8245b63 100644 --- a/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/list_page/image_list_row.vue +++ b/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/list_page/image_list_row.vue @@ -134,7 +134,7 @@ export default { v-if="item.expirationPolicyCleanupStatus" class="ml-2" :status="item.expirationPolicyCleanupStatus" - :expiration-policy-next-run-at="expirationPolicy.next_run_at" + :expiration-policy="expirationPolicy" /> </template> |