Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
a845e88a
Commit
a845e88a
authored
Oct 09, 2019
by
Nicolò Maria Mezzopera
Committed by
Clement Ho
Oct 09, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Container registry update text for delete tag btn
- use modal title - adjust tests - update locales - changelog
parent
3d311509
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
8 deletions
+10
-8
app/assets/javascripts/registry/components/table_registry.vue
...assets/javascripts/registry/components/table_registry.vue
+3
-3
changelogs/unreleased/33405-container-registry-improve-delete-modal-button.yml
.../33405-container-registry-improve-delete-modal-button.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+0
-3
spec/frontend/registry/components/table_registry_spec.js
spec/frontend/registry/components/table_registry_spec.js
+2
-2
No files found.
app/assets/javascripts/registry/components/table_registry.vue
View file @
a845e88a
...
@@ -51,7 +51,7 @@ export default {
...
@@ -51,7 +51,7 @@ export default {
shouldRenderPagination
()
{
shouldRenderPagination
()
{
return
this
.
repo
.
pagination
.
total
>
this
.
repo
.
pagination
.
perPage
;
return
this
.
repo
.
pagination
.
total
>
this
.
repo
.
pagination
.
perPage
;
},
},
modal
Title
()
{
modal
Action
()
{
return
n__
(
return
n__
(
'
ContainerRegistry|Remove tag
'
,
'
ContainerRegistry|Remove tag
'
,
'
ContainerRegistry|Remove tags
'
,
'
ContainerRegistry|Remove tags
'
,
...
@@ -269,8 +269,8 @@ export default {
...
@@ -269,8 +269,8 @@ export default {
/>
/>
<gl-modal
ref=
"deleteModal"
:modal-id=
"modalId"
ok-variant=
"danger"
>
<gl-modal
ref=
"deleteModal"
:modal-id=
"modalId"
ok-variant=
"danger"
>
<
template
v-slot:modal-title
>
{{
modal
Title
}}
</
template
>
<
template
v-slot:modal-title
>
{{
modal
Action
}}
</
template
>
<
template
v-slot:modal-ok
>
{{
s__
(
'
ContainerRegistry|Remove tag(s)
'
)
}}
</
template
>
<
template
v-slot:modal-ok
>
{{
modalAction
}}
</
template
>
<p
v-html=
"modalDescription"
></p>
<p
v-html=
"modalDescription"
></p>
</gl-modal>
</gl-modal>
</div>
</div>
...
...
changelogs/unreleased/33405-container-registry-improve-delete-modal-button.yml
0 → 100644
View file @
a845e88a
---
title
:
Container registry tag(s) delete button pluralization
merge_request
:
18260
author
:
type
:
changed
locale/gitlab.pot
View file @
a845e88a
...
@@ -4258,9 +4258,6 @@ msgid_plural "ContainerRegistry|Remove tags"
...
@@ -4258,9 +4258,6 @@ msgid_plural "ContainerRegistry|Remove tags"
msgstr[0] ""
msgstr[0] ""
msgstr[1] ""
msgstr[1] ""
msgid "ContainerRegistry|Remove tag(s)"
msgstr ""
msgid "ContainerRegistry|Size"
msgid "ContainerRegistry|Size"
msgstr ""
msgstr ""
...
...
spec/frontend/registry/components/table_registry_spec.js
View file @
a845e88a
...
@@ -196,7 +196,7 @@ describe('table registry', () => {
...
@@ -196,7 +196,7 @@ describe('table registry', () => {
it
(
'
should show the singular title and image name when deleting a single image
'
,
()
=>
{
it
(
'
should show the singular title and image name when deleting a single image
'
,
()
=>
{
wrapper
.
setData
({
itemsToBeDeleted
:
[
1
]
});
wrapper
.
setData
({
itemsToBeDeleted
:
[
1
]
});
wrapper
.
vm
.
setModalDescription
(
0
);
wrapper
.
vm
.
setModalDescription
(
0
);
expect
(
wrapper
.
vm
.
modal
Title
).
toBe
(
'
Remove tag
'
);
expect
(
wrapper
.
vm
.
modal
Action
).
toBe
(
'
Remove tag
'
);
expect
(
wrapper
.
vm
.
modalDescription
).
toContain
(
firstImage
.
tag
);
expect
(
wrapper
.
vm
.
modalDescription
).
toContain
(
firstImage
.
tag
);
});
});
...
@@ -204,7 +204,7 @@ describe('table registry', () => {
...
@@ -204,7 +204,7 @@ describe('table registry', () => {
wrapper
.
setData
({
itemsToBeDeleted
:
[
1
,
2
]
});
wrapper
.
setData
({
itemsToBeDeleted
:
[
1
,
2
]
});
wrapper
.
vm
.
setModalDescription
();
wrapper
.
vm
.
setModalDescription
();
expect
(
wrapper
.
vm
.
modal
Title
).
toBe
(
'
Remove tags
'
);
expect
(
wrapper
.
vm
.
modal
Action
).
toBe
(
'
Remove tags
'
);
expect
(
wrapper
.
vm
.
modalDescription
).
toContain
(
'
<b>2</b> tags
'
);
expect
(
wrapper
.
vm
.
modalDescription
).
toContain
(
'
<b>2</b> tags
'
);
});
});
});
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment