diff options
author | Douwe Maan <douwe@selenight.nl> | 2016-06-18 00:42:36 +0200 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2016-06-18 00:42:36 +0200 |
commit | b218e82b5c8dca6bdf84e160f47145fdc458a40c (patch) | |
tree | 7ac79863e34ceeefe08f14babf6ca37bbde4455b /config | |
parent | 5ef749b7ad940945340a726777a83f9098ed8791 (diff) | |
parent | 914f97310815365f083a38b02d8dbf6c99b63b5f (diff) | |
download | gitlab-ce-b218e82b5c8dca6bdf84e160f47145fdc458a40c.tar.gz |
Merge branch 'issuable-todo-improvements'
# Conflicts:
# app/controllers/projects/todos_controller.rb
Diffstat (limited to 'config')
-rw-r--r-- | config/routes.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb index 87da5e7178f..987d8507763 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -812,7 +812,7 @@ Rails.application.routes.draw do end end - resources :todos, only: [:create, :update], constraints: { id: /\d+/ } + resources :todos, only: [:create] resources :uploads, only: [:create] do collection do |