summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-06-14 22:01:43 +0000
committerStan Hu <stanhu@gmail.com>2016-06-14 22:01:43 +0000
commit5ac17fb2fa5b3f3ef8c4bed16f97d402858efe6f (patch)
treed85c6434cf2cb358356d41dbe7c9d869f03e7e31 /config
parent06784ee782ff8a3212e1c6f1361fc43d36ae44e5 (diff)
parentb22ba26caa233bc6cb56bc0b82f493713f657909 (diff)
downloadgitlab-ce-5ac17fb2fa5b3f3ef8c4bed16f97d402858efe6f.tar.gz
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 'config')
-rw-r--r--config/routes.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb
index fe48ae95e29..fb634901712 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -795,6 +795,8 @@ Rails.application.routes.draw do
end
end
+ resources :todos, only: [:create, :update], constraints: { id: /\d+/ }
+
resources :uploads, only: [:create] do
collection do
get ":secret/:filename", action: :show, as: :show, constraints: { filename: /[^\/]+/ }