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
e34e0351
Commit
e34e0351
authored
Feb 02, 2021
by
Marcin Sedlak-Jakubowski
Committed by
Savas Vedova
Feb 02, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change Design sidebar to say "Add to do"
To follow the format in issues, MRs, epics, and alerts.
parent
0a45fdb9
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
19 additions
and
17 deletions
+19
-17
app/assets/javascripts/design_management/utils/error_messages.js
...ets/javascripts/design_management/utils/error_messages.js
+4
-4
app/assets/javascripts/vue_shared/components/todo_button.vue
app/assets/javascripts/vue_shared/components/todo_button.vue
+1
-1
changelogs/unreleased/msj-todo-design-errors.yml
changelogs/unreleased/msj-todo-design-errors.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+7
-10
spec/frontend/design_management/components/design_todo_button_spec.js
...d/design_management/components/design_todo_button_spec.js
+1
-1
spec/frontend/vue_shared/components/todo_button_spec.js
spec/frontend/vue_shared/components/todo_button_spec.js
+1
-1
No files found.
app/assets/javascripts/design_management/utils/error_messages.js
View file @
e34e0351
...
...
@@ -44,13 +44,13 @@ export const MOVE_DESIGN_ERROR = __(
'
Something went wrong when reordering designs. Please try again
'
,
);
export
const
CREATE_DESIGN_TODO_ERROR
=
__
(
'
Failed to create
To-Do
for the design.
'
);
export
const
CREATE_DESIGN_TODO_ERROR
=
__
(
'
Failed to create
a to-do item
for the design.
'
);
export
const
CREATE_DESIGN_TODO_EXISTS_ERROR
=
__
(
'
There is already a
To-Do
for this design.
'
);
export
const
CREATE_DESIGN_TODO_EXISTS_ERROR
=
__
(
'
There is already a
to-do item
for this design.
'
);
export
const
DELETE_DESIGN_TODO_ERROR
=
__
(
'
Failed to remove
To-Do
for the design.
'
);
export
const
DELETE_DESIGN_TODO_ERROR
=
__
(
'
Failed to remove
a to-do item
for the design.
'
);
export
const
TOGGLE_TODO_ERROR
=
__
(
'
Failed to toggle
To-Do
for the design.
'
);
export
const
TOGGLE_TODO_ERROR
=
__
(
'
Failed to toggle
the to-do status
for the design.
'
);
const
MAX_SKIPPED_FILES_LISTINGS
=
5
;
...
...
app/assets/javascripts/vue_shared/components/todo_button.vue
View file @
e34e0351
...
...
@@ -15,7 +15,7 @@ export default {
},
computed
:
{
buttonLabel
()
{
return
this
.
isTodo
?
__
(
'
Mark as done
'
)
:
__
(
'
Add a
To D
o
'
);
return
this
.
isTodo
?
__
(
'
Mark as done
'
)
:
__
(
'
Add a
to d
o
'
);
},
},
};
...
...
changelogs/unreleased/msj-todo-design-errors.yml
0 → 100644
View file @
e34e0351
---
title
:
Change to-do formatting in Design error messages and sidebar
merge_request
:
53040
author
:
type
:
fixed
locale/gitlab.pot
View file @
e34e0351
...
...
@@ -1635,9 +1635,6 @@ msgstr ""
msgid "Add a Grafana button in the admin sidebar, monitoring section, to access a variety of statistics on the health and performance of GitLab."
msgstr ""
msgid "Add a To Do"
msgstr ""
msgid "Add a bullet list"
msgstr ""
...
...
@@ -12038,10 +12035,10 @@ msgstr ""
msgid "Failed to create Merge Request. Please try again."
msgstr ""
msgid "Failed to create
To-Do for the desig
n."
msgid "Failed to create
a branch for this issue. Please try agai
n."
msgstr ""
msgid "Failed to create a
branch for this issue. Please try agai
n."
msgid "Failed to create a
to-do item for the desig
n."
msgstr ""
msgid "Failed to create framework"
...
...
@@ -12158,10 +12155,10 @@ msgstr ""
msgid "Failed to publish issue on status page."
msgstr ""
msgid "Failed to remove
To-Do for the design.
"
msgid "Failed to remove
a Zoom meeting
"
msgstr ""
msgid "Failed to remove a
Zoom meeting
"
msgid "Failed to remove a
to-do item for the design.
"
msgstr ""
msgid "Failed to remove issue from board, please try again."
...
...
@@ -12206,7 +12203,7 @@ msgstr ""
msgid "Failed to signing using smartcard authentication"
msgstr ""
msgid "Failed to toggle
To-Do
for the design."
msgid "Failed to toggle
the to-do status
for the design."
msgstr ""
msgid "Failed to update branch!"
...
...
@@ -29112,10 +29109,10 @@ msgstr ""
msgid "There is a halted Elasticsearch migration"
msgstr ""
msgid "There is already a
To-Do for this design.
"
msgid "There is already a
repository with that name on disk
"
msgstr ""
msgid "There is already a
repository with that name on disk
"
msgid "There is already a
to-do item for this design.
"
msgstr ""
msgid "There is no chart data available."
...
...
spec/frontend/design_management/components/design_todo_button_spec.js
View file @
e34e0351
...
...
@@ -111,7 +111,7 @@ describe('Design management design todo button', () => {
});
it
(
'
renders correct button text
'
,
()
=>
{
expect
(
wrapper
.
text
()).
toBe
(
'
Add a
To D
o
'
);
expect
(
wrapper
.
text
()).
toBe
(
'
Add a
to d
o
'
);
});
describe
(
'
when clicked
'
,
()
=>
{
...
...
spec/frontend/vue_shared/components/todo_button_spec.js
View file @
e34e0351
...
...
@@ -33,7 +33,7 @@ describe('Todo Button', () => {
it
.
each
`
label | isTodo
${
'
Mark as done
'
}
|
${
true
}
${
'
Add a
To D
o
'
}
|
${
false
}
${
'
Add a
to d
o
'
}
|
${
false
}
`
(
'
sets correct label when isTodo is $isTodo
'
,
({
label
,
isTodo
})
=>
{
createComponent
({
isTodo
});
...
...
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