Merge branch 'develop' into standalone_develop
This commit is contained in:
commit
153243fa9c
|
@ -467,7 +467,7 @@ Rails.application.routes.draw do
|
|||
|
||||
namespace :traces do
|
||||
resources :trace_users, only: [:create]
|
||||
scope "/:owner/:repo", constraints: { repo: /[^\/|.json]+/ } do
|
||||
scope "/:owner/:repo", constraints: { repo: /[^\/]+/ } do
|
||||
resource :projects, path: '/', only: [:index] do
|
||||
member do
|
||||
post :tasks
|
||||
|
@ -480,7 +480,7 @@ Rails.application.routes.draw do
|
|||
end
|
||||
|
||||
# Project Area START
|
||||
scope "/:owner/:repo",constraints: { repo: /[^\/|.json]+/ } do
|
||||
scope "/:owner/:repo",constraints: { repo: /[^\/]+/ } do
|
||||
scope do
|
||||
get(
|
||||
'/activity',
|
||||
|
|
|
@ -18,7 +18,7 @@ defaults format: :json do
|
|||
resources :feedbacks, only: [:create]
|
||||
end
|
||||
|
||||
scope ':repo', constraints: { repo: /[^\/|.json]+/ } do
|
||||
scope ':repo', constraints: { repo: /[^\/]+/ } do
|
||||
# projects
|
||||
resource :projects, path: '/', only: [:show, :update, :edit, :destroy] do
|
||||
collection do
|
||||
|
|
Loading…
Reference in New Issue