Commit 4ca3db3f authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Refactor group routing

* separate controller actions from nested resources
* prepare group routing for nested namespaces support
Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 76ff9fff
...@@ -12,26 +12,26 @@ constraints(GroupUrlConstrainer.new) do ...@@ -12,26 +12,26 @@ constraints(GroupUrlConstrainer.new) do
end end
end end
scope constraints: { id: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ } do resources :groups, only: [:index, :new, :create]
resources :groups, except: [:show] do
member do
get :issues
get :merge_requests
get :projects
get :activity
end
scope module: :groups do scope(path: 'groups/:id', controller: :groups) do
resources :group_members, only: [:index, :create, :update, :destroy], concerns: :access_requestable do get :edit, as: :edit_group
post :resend_invite, on: :member get :issues, as: :issues_group
delete :leave, on: :collection get :merge_requests, as: :merge_requests_group
end get :projects, as: :projects_group
get :activity, as: :activity_group
resource :avatar, only: [:destroy] end
resources :milestones, constraints: { id: /[^\/]+/ }, only: [:index, :show, :update, :new, :create]
resources :labels, except: [:show], constraints: { id: /\d+/ } scope(path: 'groups/:group_id', module: :groups, as: :group) do
end resources :group_members, only: [:index, :create, :update, :destroy], concerns: :access_requestable do
post :resend_invite, on: :member
delete :leave, on: :collection
end end
get 'groups/:id' => 'groups#show', as: :group_canonical
resource :avatar, only: [:destroy]
resources :milestones, constraints: { id: /[^\/]+/ }, only: [:index, :show, :update, :new, :create]
resources :labels, except: [:show], constraints: { id: /\d+/ }
end end
# Must be last route in this file
get 'groups/:id' => 'groups#show', as: :group_canonical
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment