diff options
author | Stan Hu <stanhu@gmail.com> | 2016-06-15 01:01:43 +0300 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2016-06-15 01:01:43 +0300 |
commit | 5ac17fb2fa5b3f3ef8c4bed16f97d402858efe6f (patch) | |
tree | d85c6434cf2cb358356d41dbe7c9d869f03e7e31 /app/finders | |
parent | 06784ee782ff8a3212e1c6f1361fc43d36ae44e5 (diff) | |
parent | b22ba26caa233bc6cb56bc0b82f493713f657909 (diff) |
Merge branch 'manual-todos-issuable-sidebar' into 'master'
Manually create todo for issuable
## What does this MR do?
Adds a button to the sidebar in issues & merge requests to allow users to manually create a todo item themselves.
## What are the relevant issue numbers?
Closes #15045
## Screenshots (if relevant)
![Screen_Shot_2016-06-07_at_09.52.14](/uploads/00af70244c0589d19f241c3e85f3d63d/Screen_Shot_2016-06-07_at_09.52.14.png)
![Screen_Shot_2016-06-07_at_09.52.06](/uploads/e232b02208613a4a50cff4d1e6f119ff/Screen_Shot_2016-06-07_at_09.52.06.png)
![Screen_Shot_2016-06-07_at_09.51.14](/uploads/f1d36435d49ab882538ae2252bec8086/Screen_Shot_2016-06-07_at_09.51.14.png)
See merge request !4502
Diffstat (limited to 'app/finders')
-rw-r--r-- | app/finders/todos_finder.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/finders/todos_finder.rb b/app/finders/todos_finder.rb index 1d88116d7d2..aa47c6c157e 100644 --- a/app/finders/todos_finder.rb +++ b/app/finders/todos_finder.rb @@ -36,7 +36,7 @@ class TodosFinder private def action_id? - action_id.present? && [Todo::ASSIGNED, Todo::MENTIONED, Todo::BUILD_FAILED].include?(action_id.to_i) + action_id.present? && [Todo::ASSIGNED, Todo::MENTIONED, Todo::BUILD_FAILED, Todo::MARKED].include?(action_id.to_i) end def action_id |