diff options
author | Connor Shea <connor.james.shea@gmail.com> | 2016-08-17 21:10:09 +0300 |
---|---|---|
committer | Connor Shea <connor.james.shea@gmail.com> | 2016-08-17 21:10:09 +0300 |
commit | d8654744cd6c8fa4cbe4617c2428cd79d4bd5179 (patch) | |
tree | 159d92727944184792c939210b5b73aaf348336a /config/routes.rb | |
parent | 4a13aa9f34ab4114bc485e1ca8fa0db8daa0394b (diff) | |
parent | 46dc00631aeae34c1964888625c5ccd04da6b4c1 (diff) |
Merge branch 'master' into diff-line-comment-vuejs
Diffstat (limited to 'config/routes.rb')
-rw-r--r-- | config/routes.rb | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb index d5393455b89..624e07b0947 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -727,7 +727,9 @@ Rails.application.routes.draw do member do get :commits get :diffs + get :conflicts get :builds + get :pipelines get :merge_check post :merge post :cancel_merge_when_build_succeeds @@ -736,6 +738,7 @@ Rails.application.routes.draw do post :toggle_award_emoji post :remove_wip get :diff_for_path + post :resolve_conflicts end collection do @@ -865,6 +868,20 @@ Rails.application.routes.draw do end end + resource :board, only: [:show] do + scope module: :boards do + resources :issues, only: [:update] + + resources :lists, only: [:index, :create, :update, :destroy] do + collection do + post :generate + end + + resources :issues, only: [:index] + end + end + end + resources :todos, only: [:create] resources :uploads, only: [:create] do |