diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-05 00:05:59 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-05 00:05:59 +0000 |
commit | 7b871b34980ed6b21e080b4937860aaf898b7fa4 (patch) | |
tree | dfc2ede476b30ae97cbf5a68af6072ae1df47e72 /app/assets/javascripts | |
parent | a2022f4a2e4bda90ca89981f4af851a3068343d0 (diff) | |
download | gitlab-ce-7b871b34980ed6b21e080b4937860aaf898b7fa4.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r-- | app/assets/javascripts/registry/components/table_registry.vue | 20 | ||||
-rw-r--r-- | app/assets/javascripts/reports/components/report_section.vue | 2 |
2 files changed, 10 insertions, 12 deletions
diff --git a/app/assets/javascripts/registry/components/table_registry.vue b/app/assets/javascripts/registry/components/table_registry.vue index ec0bad58b79..9a2291613e4 100644 --- a/app/assets/javascripts/registry/components/table_registry.vue +++ b/app/assets/javascripts/registry/components/table_registry.vue @@ -53,8 +53,8 @@ export default { }, modalTitle() { return n__( - 'ContainerRegistry|Remove image', - 'ContainerRegistry|Remove images', + 'ContainerRegistry|Remove tag', + 'ContainerRegistry|Remove tags', this.itemsToBeDeleted.length === 0 ? 1 : this.itemsToBeDeleted.length, ); }, @@ -67,16 +67,14 @@ export default { setModalDescription(itemIndex = -1) { if (itemIndex === -1) { this.modalDescription = sprintf( - s__(`ContainerRegistry|You are about to delete <b>%{count}</b> images. This will - delete the images and all tags pointing to them.`), + s__(`ContainerRegistry|You are about to remove <b>%{count}</b> tags. Are you sure?`), { count: this.itemsToBeDeleted.length }, ); } else { const { tag } = this.repo.list[itemIndex]; this.modalDescription = sprintf( - s__(`ContainerRegistry|You are about to delete the image <b>%{title}</b>. This will - delete the image and all tags pointing to this image.`), + s__(`ContainerRegistry|You are about to remove <b>%{title}</b>. Are you sure?`), { title: `${this.repo.name}:${tag}` }, ); } @@ -195,8 +193,8 @@ export default { :disabled="!itemsToBeDeleted || itemsToBeDeleted.length === 0" class="js-delete-registry float-right" variant="danger" - :title="s__('ContainerRegistry|Remove selected images')" - :aria-label="s__('ContainerRegistry|Remove selected images')" + :title="s__('ContainerRegistry|Remove selected tags')" + :aria-label="s__('ContainerRegistry|Remove selected tags')" @click="deleteMultipleItems()" > <icon name="remove" /> @@ -246,8 +244,8 @@ export default { <gl-button v-if="item.canDelete" v-gl-modal="modalId" - :title="s__('ContainerRegistry|Remove image')" - :aria-label="s__('ContainerRegistry|Remove image')" + :title="s__('ContainerRegistry|Remove tag')" + :aria-label="s__('ContainerRegistry|Remove tag')" variant="danger" class="js-delete-registry-row float-right btn-inverted btn-border-color btn-icon" @click="deleteSingleItem(index)" @@ -268,7 +266,7 @@ export default { <gl-modal ref="deleteModal" :modal-id="modalId" ok-variant="danger"> <template v-slot:modal-title>{{ modalTitle }}</template> - <template v-slot:modal-ok>{{ s__('ContainerRegistry|Remove image(s) and tags') }}</template> + <template v-slot:modal-ok>{{ s__('ContainerRegistry|Remove tag(s)') }}</template> <p v-html="modalDescription"></p> </gl-modal> </div> diff --git a/app/assets/javascripts/reports/components/report_section.vue b/app/assets/javascripts/reports/components/report_section.vue index 24612c8681a..45c890769a0 100644 --- a/app/assets/javascripts/reports/components/report_section.vue +++ b/app/assets/javascripts/reports/components/report_section.vue @@ -179,7 +179,7 @@ export default { <button v-if="isCollapsible" type="button" - class="js-collapse-btn btn float-right btn-sm qa-expand-report-button" + class="js-collapse-btn btn float-right btn-sm align-self-start qa-expand-report-button" @click="toggleCollapsed" > {{ collapseText }} |