summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/routes/group.rb10
-rw-r--r--lib/gitlab/path_regex.rb2
2 files changed, 6 insertions, 6 deletions
diff --git a/config/routes/group.rb b/config/routes/group.rb
index bd04ad51076..e578dd8b082 100644
--- a/config/routes/group.rb
+++ b/config/routes/group.rb
@@ -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',
diff --git a/lib/gitlab/path_regex.rb b/lib/gitlab/path_regex.rb
index f0d5e3f7bc0..10eb99fb461 100644
--- a/lib/gitlab/path_regex.rb
+++ b/lib/gitlab/path_regex.rb
@@ -129,8 +129,6 @@ module Gitlab
pipeline_quota
projects
subgroups
- settings
- variables
].freeze
ILLEGAL_PROJECT_PATH_WORDS = PROJECT_WILDCARD_ROUTES