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
d8fb8f3c
Commit
d8fb8f3c
authored
Oct 08, 2020
by
Marcin Sedlak-Jakubowski
Committed by
Kushal Pandya
Oct 08, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix "Add a to do" spelling on issuables
parent
2c7a756b
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
37 additions
and
30 deletions
+37
-30
app/helpers/issuables_helper.rb
app/helpers/issuables_helper.rb
+1
-1
app/views/dashboard/todos/_todo.html.haml
app/views/dashboard/todos/_todo.html.haml
+1
-1
doc/user/project/issues/issue_data_and_actions.md
doc/user/project/issues/issue_data_and_actions.md
+1
-1
doc/user/todos.md
doc/user/todos.md
+6
-2
lib/gitlab/quick_actions/issuable_actions.rb
lib/gitlab/quick_actions/issuable_actions.rb
+6
-6
locale/gitlab.pot
locale/gitlab.pot
+13
-10
spec/features/dashboard/todos/todos_spec.rb
spec/features/dashboard/todos/todos_spec.rb
+2
-2
spec/features/issues/todo_spec.rb
spec/features/issues/todo_spec.rb
+2
-2
spec/frontend/collapsed_sidebar_todo_spec.js
spec/frontend/collapsed_sidebar_todo_spec.js
+3
-3
spec/services/quick_actions/interpret_service_spec.rb
spec/services/quick_actions/interpret_service_spec.rb
+2
-2
No files found.
app/helpers/issuables_helper.rb
View file @
d8fb8f3c
...
...
@@ -435,7 +435,7 @@ module IssuablesHelper
def
issuable_todo_button_data
(
issuable
,
is_collapsed
)
{
todo_text:
_
(
'Add a
To D
o'
),
todo_text:
_
(
'Add a
to d
o'
),
mark_text:
_
(
'Mark as done'
),
todo_icon:
sprite_icon
(
'todo-add'
),
mark_icon:
sprite_icon
(
'todo-done'
,
css_class:
'todo-undone'
),
...
...
app/views/dashboard/todos/_todo.html.haml
View file @
d8fb8f3c
...
...
@@ -57,5 +57,5 @@
-
else
.todo-actions
=
link_to
restore_dashboard_todo_path
(
todo
),
method: :patch
,
class:
'btn btn-loading d-flex align-items-center js-add-todo'
,
data:
{
href:
restore_dashboard_todo_path
(
todo
)
}
do
Add a
To D
o
Add a
to d
o
%span
.spinner.ml-1
doc/user/project/issues/issue_data_and_actions.md
View file @
d8fb8f3c
...
...
@@ -80,7 +80,7 @@ The button to do this has a different label depending on whether the issue is al
List or not. If the issue is:
-
Already on your To-Do List: The button is labeled
**Mark as done**
. Click the button to remove the issue from your To-Do List.
-
Not on your To-Do List: The button is labeled
**Add a
To D
o**
. Click the button to add the issue to your To-Do List.
-
Not on your To-Do List: The button is labeled
**Add a
to d
o**
. Click the button to add the issue to your To-Do List.
### Assignee
...
...
doc/user/todos.md
View file @
d8fb8f3c
...
...
@@ -93,8 +93,12 @@ for filtering purposes; otherwise, they appear as normal.
### Manually creating a to do
You can add an issue or merge request (or epic
**(ULTIMATE)**
) to your
To-Do List by clicking its
**Add a To Do**
button.
You can also add the following to your To-Do List by clicking the
**Add a to do**
button on an:
-
[
Issue
](
project/issues/index.md
)
-
[
Merge Request
](
project/merge_requests/index.md
)
-
[
Epic
](
group/epics/index.md
)
**(ULTIMATE)**
-
[
Design
](
project/issues/design_management.md
)
![
Adding a To Do from the issuable sidebar
](
img/todos_add_todo_sidebar.png
)
...
...
lib/gitlab/quick_actions/issuable_actions.rb
View file @
d8fb8f3c
...
...
@@ -145,9 +145,9 @@ module Gitlab
run_label_command
(
labels:
find_labels
(
labels_param
),
command: :relabel
,
updates_key: :label_ids
)
end
desc
_
(
'Add a
To D
o'
)
explanation
_
(
'Adds a
To D
o.'
)
execution_message
_
(
'Added a
To D
o.'
)
desc
_
(
'Add a
to d
o'
)
explanation
_
(
'Adds a
to d
o.'
)
execution_message
_
(
'Added a
to d
o.'
)
types
Issuable
condition
do
quick_action_target
.
persisted?
&&
...
...
@@ -157,9 +157,9 @@ module Gitlab
@updates
[
:todo_event
]
=
'add'
end
desc
_
(
'Mark
To D
o as done'
)
explanation
_
(
'Marks
To D
o as done.'
)
execution_message
_
(
'Marked
To D
o as done.'
)
desc
_
(
'Mark
to d
o as done'
)
explanation
_
(
'Marks
to d
o as done.'
)
execution_message
_
(
'Marked
to d
o as done.'
)
types
Issuable
condition
do
quick_action_target
.
persisted?
&&
...
...
locale/gitlab.pot
View file @
d8fb8f3c
...
...
@@ -1604,6 +1604,9 @@ msgstr ""
msgid "Add a task list"
msgstr ""
msgid "Add a to do"
msgstr ""
msgid "Add additional text to appear in all email communications. %{character_limit} character limit"
msgstr ""
...
...
@@ -1757,7 +1760,7 @@ msgstr ""
msgid "Added %{label_references} %{label_text}."
msgstr ""
msgid "Added a
To D
o."
msgid "Added a
to d
o."
msgstr ""
msgid "Added an issue to an epic."
...
...
@@ -1793,10 +1796,10 @@ msgstr ""
msgid "Adds %{labels} %{label_text}."
msgstr ""
msgid "Adds a
To Do.
"
msgid "Adds a
Zoom meeting
"
msgstr ""
msgid "Adds a
Zoom meeting
"
msgid "Adds a
to do.
"
msgstr ""
msgid "Adds an issue to an epic."
...
...
@@ -15618,9 +15621,6 @@ msgstr ""
msgid "March"
msgstr ""
msgid "Mark To Do as done"
msgstr ""
msgid "Mark as done"
msgstr ""
...
...
@@ -15639,6 +15639,9 @@ msgstr ""
msgid "Mark this issue as related to another issue"
msgstr ""
msgid "Mark to do as done"
msgstr ""
msgid "Markdown"
msgstr ""
...
...
@@ -15672,9 +15675,6 @@ msgstr ""
msgid "Marked For Deletion At - %{deletion_time}"
msgstr ""
msgid "Marked To Do as done."
msgstr ""
msgid "Marked this %{noun} as Work In Progress."
msgstr ""
...
...
@@ -15684,7 +15684,7 @@ msgstr ""
msgid "Marked this issue as related to %{issue_ref}."
msgstr ""
msgid "Mark
s To D
o as done."
msgid "Mark
ed to d
o as done."
msgstr ""
msgid "Marks this %{noun} as Work In Progress."
...
...
@@ -15696,6 +15696,9 @@ msgstr ""
msgid "Marks this issue as related to %{issue_ref}."
msgstr ""
msgid "Marks to do as done."
msgstr ""
msgid "Mask variable"
msgstr ""
...
...
spec/features/dashboard/todos/todos_spec.rb
View file @
d8fb8f3c
...
...
@@ -228,7 +228,7 @@ RSpec.describe 'Dashboard Todos' do
describe
'restoring the todo'
do
before
do
within
first
(
'.todo'
)
do
click_link
'Add a
To D
o'
click_link
'Add a
to d
o'
end
end
...
...
@@ -243,7 +243,7 @@ RSpec.describe 'Dashboard Todos' do
end
end
context
'User has
To
dos with labels spanning multiple projects'
do
context
'User has
to
dos with labels spanning multiple projects'
do
before
do
label1
=
create
(
:label
,
project:
project
)
note1
=
create
(
:note_on_issue
,
note:
"Hello
#{
label1
.
to_reference
(
format: :name
)
}
"
,
noteable_id:
issue
.
id
,
noteable_type:
'Issue'
,
project:
issue
.
project
)
...
...
spec/features/issues/todo_spec.rb
View file @
d8fb8f3c
...
...
@@ -15,7 +15,7 @@ RSpec.describe 'Manually create a todo item from issue', :js do
it
'creates todo when clicking button'
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'
end
...
...
@@ -32,7 +32,7 @@ RSpec.describe 'Manually create a todo item from issue', :js do
it
'marks a todo as done'
do
page
.
within
'.issuable-sidebar'
do
click_button
'Add a
To D
o'
click_button
'Add a
to d
o'
click_button
'Mark as done'
end
...
...
spec/frontend/collapsed_sidebar_todo_spec.js
View file @
d8fb8f3c
...
...
@@ -59,7 +59,7 @@ describe('Issuable right sidebar collapsed todo toggle', () => {
it
(
'
sets default tooltip title
'
,
()
=>
{
expect
(
document
.
querySelector
(
'
.js-issuable-todo.sidebar-collapsed-icon
'
).
getAttribute
(
'
title
'
),
).
toBe
(
'
Add a
To D
o
'
);
).
toBe
(
'
Add a
to d
o
'
);
});
it
(
'
toggle todo state
'
,
done
=>
{
...
...
@@ -125,7 +125,7 @@ describe('Issuable right sidebar collapsed todo toggle', () => {
expect
(
document
.
querySelector
(
'
.issuable-sidebar-header .js-issuable-todo
'
).
textContent
.
trim
(),
).
toBe
(
'
Add a
To D
o
'
);
).
toBe
(
'
Add a
to d
o
'
);
})
.
then
(
done
)
.
catch
(
done
.
fail
);
...
...
@@ -164,7 +164,7 @@ describe('Issuable right sidebar collapsed todo toggle', () => {
document
.
querySelector
(
'
.js-issuable-todo.sidebar-collapsed-icon
'
)
.
getAttribute
(
'
aria-label
'
),
).
toBe
(
'
Add a
To D
o
'
);
).
toBe
(
'
Add a
to d
o
'
);
})
.
then
(
done
)
.
catch
(
done
.
fail
);
...
...
spec/services/quick_actions/interpret_service_spec.rb
View file @
d8fb8f3c
...
...
@@ -228,7 +228,7 @@ RSpec.describe QuickActions::InterpretService do
it
'returns the todo message'
do
_
,
_
,
message
=
service
.
execute
(
content
,
issuable
)
expect
(
message
).
to
eq
(
'Added a
To D
o.'
)
expect
(
message
).
to
eq
(
'Added a
to d
o.'
)
end
end
...
...
@@ -244,7 +244,7 @@ RSpec.describe QuickActions::InterpretService do
TodoService
.
new
.
mark_todo
(
issuable
,
developer
)
_
,
_
,
message
=
service
.
execute
(
content
,
issuable
)
expect
(
message
).
to
eq
(
'Marked
To D
o as done.'
)
expect
(
message
).
to
eq
(
'Marked
to d
o as done.'
)
end
end
...
...
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