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
a97f5067
Commit
a97f5067
authored
Jan 28, 2021
by
Yogi
Committed by
Simon Knox
Jan 28, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix "Add a to do" spelling on alerts and epics
parent
260e0afc
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
13 additions
and
11 deletions
+13
-11
app/assets/javascripts/sidebar/components/todo_toggle/todo.vue
...ssets/javascripts/sidebar/components/todo_toggle/todo.vue
+1
-1
changelogs/unreleased/299102-fix-spelling.yml
changelogs/unreleased/299102-fix-spelling.yml
+5
-0
doc/operations/incident_management/alerts.md
doc/operations/incident_management/alerts.md
+2
-2
doc/operations/incident_management/img/alert_detail_add_todo_v13_1.png
...s/incident_management/img/alert_detail_add_todo_v13_1.png
+0
-0
doc/operations/incident_management/img/alert_detail_add_todo_v13_9.png
...s/incident_management/img/alert_detail_add_todo_v13_9.png
+0
-0
ee/spec/features/epics/todo_spec.rb
ee/spec/features/epics/todo_spec.rb
+2
-2
locale/gitlab.pot
locale/gitlab.pot
+0
-3
spec/features/alert_management/alert_details_spec.rb
spec/features/alert_management/alert_details_spec.rb
+1
-1
spec/frontend/alert_management/components/alert_management_sidebar_todo_spec.js
...nagement/components/alert_management_sidebar_todo_spec.js
+1
-1
spec/frontend/sidebar/todo_spec.js
spec/frontend/sidebar/todo_spec.js
+1
-1
No files found.
app/assets/javascripts/sidebar/components/todo_toggle/todo.vue
View file @
a97f5067
...
@@ -3,7 +3,7 @@ import { GlLoadingIcon, GlIcon, GlTooltipDirective } from '@gitlab/ui';
...
@@ -3,7 +3,7 @@ import { GlLoadingIcon, GlIcon, GlTooltipDirective } from '@gitlab/ui';
import
{
__
}
from
'
~/locale
'
;
import
{
__
}
from
'
~/locale
'
;
const
MARK_TEXT
=
__
(
'
Mark as done
'
);
const
MARK_TEXT
=
__
(
'
Mark as done
'
);
const
TODO_TEXT
=
__
(
'
Add a
To-D
o
'
);
const
TODO_TEXT
=
__
(
'
Add a
to d
o
'
);
export
default
{
export
default
{
components
:
{
components
:
{
...
...
changelogs/unreleased/299102-fix-spelling.yml
0 → 100644
View file @
a97f5067
---
title
:
Fix Add a to do spelling on epics
merge_request
:
52292
author
:
Yogi (@yo)
type
:
other
doc/operations/incident_management/alerts.md
View file @
a97f5067
...
@@ -196,9 +196,9 @@ add a to-do item:
...
@@ -196,9 +196,9 @@ add a to-do item:
1.
To display the list of current alerts, navigate to
**Operations > Alerts**
.
1.
To display the list of current alerts, navigate to
**Operations > Alerts**
.
1.
Select your desired alert to display its
**Alert Management Details View**
.
1.
Select your desired alert to display its
**Alert Management Details View**
.
1.
Select the
**Add a
To-D
o**
button in the right sidebar:
1.
Select the
**Add a
to d
o**
button in the right sidebar:
!
[
Alert Details Add a
To-Do
](
img/alert_detail_add_todo_v13_1
.png
)
!
[
Alert Details Add a
to do
](
img/alert_detail_add_todo_v13_9
.png
)
Select the
**To-Do List**
**{todo-done}**
in the navigation bar to view your current to-do list.
Select the
**To-Do List**
**{todo-done}**
in the navigation bar to view your current to-do list.
...
...
doc/operations/incident_management/img/alert_detail_add_todo_v13_1.png
deleted
100644 → 0
View file @
260e0afc
16.4 KB
doc/operations/incident_management/img/alert_detail_add_todo_v13_9.png
0 → 100644
View file @
a97f5067
26.1 KB
ee/spec/features/epics/todo_spec.rb
View file @
a97f5067
...
@@ -16,7 +16,7 @@ RSpec.describe 'Manually create a todo item from epic', :js do
...
@@ -16,7 +16,7 @@ RSpec.describe 'Manually create a todo item from epic', :js do
it
'creates todo when clicking button'
do
it
'creates todo when clicking button'
do
page
.
within
'.issuable-sidebar'
do
page
.
within
'.issuable-sidebar'
do
click_button
'Add a
To-D
o'
click_button
'Add a
to d
o'
expect
(
page
).
to
have_content
'Mark as done'
expect
(
page
).
to
have_content
'Mark as done'
end
end
...
@@ -28,7 +28,7 @@ RSpec.describe 'Manually create a todo item from epic', :js do
...
@@ -28,7 +28,7 @@ RSpec.describe 'Manually create a todo item from epic', :js do
it
'marks a todo as done'
do
it
'marks a todo as done'
do
page
.
within
'.issuable-sidebar'
do
page
.
within
'.issuable-sidebar'
do
click_button
'Add a
To-D
o'
click_button
'Add a
to d
o'
end
end
expect
(
page
).
to
have_selector
(
'.todos-count'
,
visible:
true
)
expect
(
page
).
to
have_selector
(
'.todos-count'
,
visible:
true
)
...
...
locale/gitlab.pot
View file @
a97f5067
...
@@ -1624,9 +1624,6 @@ msgstr ""
...
@@ -1624,9 +1624,6 @@ msgstr ""
msgid "Add a To Do"
msgid "Add a To Do"
msgstr ""
msgstr ""
msgid "Add a To-Do"
msgstr ""
msgid "Add a bullet list"
msgid "Add a bullet list"
msgstr ""
msgstr ""
...
...
spec/features/alert_management/alert_details_spec.rb
View file @
a97f5067
...
@@ -47,7 +47,7 @@ RSpec.describe 'Alert details', :js do
...
@@ -47,7 +47,7 @@ RSpec.describe 'Alert details', :js do
expect
(
page
).
to
have_selector
(
'[data-testid="alert-todo-button"]'
)
expect
(
page
).
to
have_selector
(
'[data-testid="alert-todo-button"]'
)
todo_button
=
find
(
'[data-testid="alert-todo-button"]'
)
todo_button
=
find
(
'[data-testid="alert-todo-button"]'
)
expect
(
todo_button
).
to
have_content
(
'Add a
To-D
o'
)
expect
(
todo_button
).
to
have_content
(
'Add a
to d
o'
)
find
(
'[data-testid="alert-todo-button"]'
).
click
find
(
'[data-testid="alert-todo-button"]'
).
click
wait_for_requests
wait_for_requests
...
...
spec/frontend/alert_management/components/alert_management_sidebar_todo_spec.js
View file @
a97f5067
...
@@ -59,7 +59,7 @@ describe('Alert Details Sidebar To Do', () => {
...
@@ -59,7 +59,7 @@ describe('Alert Details Sidebar To Do', () => {
it
(
'
renders a button for adding a To-Do
'
,
async
()
=>
{
it
(
'
renders a button for adding a To-Do
'
,
async
()
=>
{
await
wrapper
.
vm
.
$nextTick
();
await
wrapper
.
vm
.
$nextTick
();
expect
(
findToDoButton
().
text
()).
toBe
(
'
Add a
To-D
o
'
);
expect
(
findToDoButton
().
text
()).
toBe
(
'
Add a
to d
o
'
);
});
});
it
(
'
calls `$apollo.mutate` with `createAlertTodoMutation` mutation and variables containing `iid`, `todoEvent`, & `projectPath`
'
,
async
()
=>
{
it
(
'
calls `$apollo.mutate` with `createAlertTodoMutation` mutation and variables containing `iid`, `todoEvent`, & `projectPath`
'
,
async
()
=>
{
...
...
spec/frontend/sidebar/todo_spec.js
View file @
a97f5067
...
@@ -35,7 +35,7 @@ describe('SidebarTodo', () => {
...
@@ -35,7 +35,7 @@ describe('SidebarTodo', () => {
it
.
each
`
it
.
each
`
isTodo | iconClass | label | icon
isTodo | iconClass | label | icon
${
false
}
|
${
''
}
|
${
'
Add a
To-D
o
'
}
|
${
'
todo-add
'
}
${
false
}
|
${
''
}
|
${
'
Add a
to d
o
'
}
|
${
'
todo-add
'
}
${
true
}
|
${
'
todo-undone
'
}
|
${
'
Mark as done
'
}
|
${
'
todo-done
'
}
${
true
}
|
${
'
todo-undone
'
}
|
${
'
Mark as done
'
}
|
${
'
todo-done
'
}
`
(
`
(
'
renders proper button when `isTodo` prop is `$isTodo`
'
,
'
renders proper button when `isTodo` prop is `$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