diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-23 15:08:41 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-23 15:08:41 +0300 |
commit | 097eb364752b8dbb08758e6b7b98a6e4030792c8 (patch) | |
tree | 2cced0bb935a3819f4077eebd96a44f6bbce4ced /app/assets/javascripts/packages_and_registries | |
parent | c71c2ba4c29ed3cc483e528a32f34816c98c39f4 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/packages_and_registries')
2 files changed, 5 insertions, 2 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 3ae69731537..56da8e88b7a 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 @@ -56,6 +56,9 @@ export default { calculatedTimeTilNextRun() { return timeTilRun(this.expirationPolicy?.next_run); }, + expireIconName() { + return this.failedDelete ? 'expire' : 'clock'; + }, }, statusPopoverOptions: { triggers: 'hover', @@ -75,7 +78,7 @@ export default { class="gl-display-inline-flex gl-align-items-center" > <div class="gl-display-inline-flex gl-align-items-center"> - <gl-icon name="expire" data-testid="main-icon" /> + <gl-icon :name="expireIconName" data-testid="main-icon" /> </div> <span class="gl-mx-2"> {{ statusText }} diff --git a/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/list_page/registry_header.vue b/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/list_page/registry_header.vue index 4ffd8390e4d..19d35a135fd 100644 --- a/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/list_page/registry_header.vue +++ b/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/list_page/registry_header.vue @@ -107,7 +107,7 @@ export default { <metadata-item v-if="!hideExpirationPolicyData" data-testid="expiration-policy" - icon="expire" + icon="clock" :text="expirationPolicyText" size="xl" /> |