kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Wrap additional routes by dash(-). And remove those routes from path_regex.rb.

This commit is contained in:
Shinya Maeda 2017-07-03 23:46:08 +09:00
parent d633bf0afb
commit f8a2f6f115
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/routes/group.rb
View File

@ -24,12 +24,14 @@ scope(path: 'groups/*group_id',
post :toggle_subscription, on: :member post :toggle_subscription, on: :member
end end
scope path: '-' do
namespace :settings do namespace :settings do
resource :ci_cd, only: [:show], controller: 'ci_cd' resource :ci_cd, only: [:show], controller: 'ci_cd'
end end
resources :variables, only: [:index, :show, :update, :create, :destroy] resources :variables, only: [:index, :show, :update, :create, :destroy]
end end
end
scope(path: 'groups/*id', scope(path: 'groups/*id',
controller: :groups, controller: :groups,

2
lib/gitlab/path_regex.rb
View File

@ -129,8 +129,6 @@ module Gitlab
pipeline_quota pipeline_quota
projects projects
subgroups subgroups
settings
variables
].freeze ].freeze
ILLEGAL_PROJECT_PATH_WORDS = PROJECT_WILDCARD_ROUTES ILLEGAL_PROJECT_PATH_WORDS = PROJECT_WILDCARD_ROUTES