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
d688f6fe
Commit
d688f6fe
authored
Oct 02, 2020
by
Matthew Nearents
Committed by
Natalia Tepluhina
Oct 02, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Remove hyphen in To-Do in Design Management"
parent
139b4899
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
4 deletions
+4
-4
app/assets/javascripts/design_management/components/design_sidebar.vue
...vascripts/design_management/components/design_sidebar.vue
+1
-1
app/assets/javascripts/vue_shared/components/todo_button.vue
app/assets/javascripts/vue_shared/components/todo_button.vue
+1
-1
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/components/design_sidebar.vue
View file @
d688f6fe
...
...
@@ -126,7 +126,7 @@ export default {
v-if=
"showTodoButton"
class=
"gl-py-4 gl-mb-4 gl-display-flex gl-justify-content-space-between gl-align-items-center gl-border-b-1 gl-border-b-solid gl-border-b-gray-100"
>
<span>
{{
__
(
'
To
-
Do
'
)
}}
</span>
<span>
{{
__
(
'
To
Do
'
)
}}
</span>
<design-todo-button
:design=
"design"
@
error=
"$emit('todoError', $event)"
/>
</div>
<h2
class=
"gl-font-weight-bold gl-mt-0"
>
...
...
app/assets/javascripts/vue_shared/components/todo_button.vue
View file @
d688f6fe
...
...
@@ -15,7 +15,7 @@ export default {
},
computed
:
{
buttonLabel
()
{
return
this
.
isTodo
?
__
(
'
Mark as done
'
)
:
__
(
'
Add a To
-
Do
'
);
return
this
.
isTodo
?
__
(
'
Mark as done
'
)
:
__
(
'
Add a To
Do
'
);
},
},
};
...
...
spec/frontend/design_management/components/design_todo_button_spec.js
View file @
d688f6fe
...
...
@@ -111,7 +111,7 @@ describe('Design management design todo button', () => {
});
it
(
'
renders correct button text
'
,
()
=>
{
expect
(
wrapper
.
text
()).
toBe
(
'
Add a To
-
Do
'
);
expect
(
wrapper
.
text
()).
toBe
(
'
Add a To
Do
'
);
});
describe
(
'
when clicked
'
,
()
=>
{
...
...
spec/frontend/vue_shared/components/todo_button_spec.js
View file @
d688f6fe
...
...
@@ -33,7 +33,7 @@ describe('Todo Button', () => {
it
.
each
`
label | isTodo
${
'
Mark as done
'
}
|
${
true
}
${
'
Add a To
-
Do
'
}
|
${
false
}
${
'
Add a To
Do
'
}
|
${
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