floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into standalone_develop

This commit is contained in:
yystopf 2023-04-07 10:35:52 +08:00
parent 78cf3debbb 39a851b74b
commit 153243fa9c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/routes.rb
View File

@ -467,7 +467,7 @@ Rails.application.routes.draw do
namespace :traces do namespace :traces do
resources :trace_users, only: [:create] resources :trace_users, only: [:create]
scope "/:owner/:repo", constraints: { repo: /[^\/|.json]+/ } do scope "/:owner/:repo", constraints: { repo: /[^\/]+/ } do
resource :projects, path: '/', only: [:index] do resource :projects, path: '/', only: [:index] do
member do member do
post :tasks post :tasks
@ -480,7 +480,7 @@ Rails.application.routes.draw do
end end
# Project Area START # Project Area START
scope "/:owner/:repo",constraints: { repo: /[^\/|.json]+/ } do scope "/:owner/:repo",constraints: { repo: /[^\/]+/ } do
scope do scope do
get( get(
'/activity', '/activity',

2
config/routes/api.rb
View File

@ -18,7 +18,7 @@ defaults format: :json do
resources :feedbacks, only: [:create] resources :feedbacks, only: [:create]
end end
scope ':repo', constraints: { repo: /[^\/|.json]+/ } do scope ':repo', constraints: { repo: /[^\/]+/ } do
# projects # projects
resource :projects, path: '/', only: [:show, :update, :edit, :destroy] do resource :projects, path: '/', only: [:show, :update, :edit, :destroy] do
collection do collection do