diff options
Diffstat (limited to 'config/routes/group.rb')
| -rw-r--r-- | config/routes/group.rb | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/config/routes/group.rb b/config/routes/group.rb index 11cdff55ed8..7b29e0e807c 100644 --- a/config/routes/group.rb +++ b/config/routes/group.rb @@ -1,11 +1,9 @@ -require 'constraints/group_url_constrainer' - resources :groups, only: [:index, :new, :create] scope(path: 'groups/*group_id', module: :groups, as: :group, - constraints: { group_id: Gitlab::PathRegex.full_namespace_route_regex }) do + constraints: { group_id: Gitlab::Regex.namespace_route_regex }) do resources :group_members, only: [:index, :create, :update, :destroy], concerns: :access_requestable do post :resend_invite, on: :member delete :leave, on: :collection @@ -27,7 +25,7 @@ end scope(path: 'groups/*id', controller: :groups, - constraints: { id: Gitlab::PathRegex.full_namespace_route_regex, format: /(html|json|atom)/ }) do + constraints: { id: Gitlab::Regex.namespace_route_regex, format: /(html|json|atom)/ }) do get :edit, as: :edit_group get :issues, as: :issues_group get :merge_requests, as: :merge_requests_group @@ -36,15 +34,3 @@ scope(path: 'groups/*id', get :subgroups, as: :subgroups_group get '/', action: :show, as: :group_canonical end - -constraints(GroupUrlConstrainer.new) do - scope(path: '*id', - as: :group, - constraints: { id: Gitlab::PathRegex.full_namespace_route_regex, format: /(html|json|atom)/ }, - controller: :groups) do - get '/', action: :show - patch '/', action: :update - put '/', action: :update - delete '/', action: :destroy - end -end |