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

View File

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

View File

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