summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-10-24 10:19:36 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-10-24 13:14:00 +0300
commit9dbd5b3cfad10b214ae5ef27c39246bbb74a5077 (patch)
treef24fbe8b42f3849f69462177c4352d84e2b76202 /config
parent1a7ba2a5e8603222b51a9e9cf0ffcde68cf593d2 (diff)
downloadgitlab-ce-9dbd5b3cfad10b214ae5ef27c39246bbb74a5077.tar.gz
Revert "Change "Group#web_url" to return "/groups/twitter" rather than "/twitter"."
This reverts commit c81ff152e08d58c13efbd50c40dd2e083ac65083.
Diffstat (limited to 'config')
-rw-r--r--config/routes/group.rb33
1 files changed, 15 insertions, 18 deletions
diff --git a/config/routes/group.rb b/config/routes/group.rb
index 826048ba196..4838c9d91c6 100644
--- a/config/routes/group.rb
+++ b/config/routes/group.rb
@@ -12,26 +12,23 @@ constraints(GroupUrlConstrainer.new) do
end
end
-scope constraints: { id: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ } do
- resources :groups, except: [:show] do
- member do
- get :issues
- get :merge_requests
- get :projects
- get :activity
- end
+resources :groups, constraints: { id: /[a-zA-Z.0-9_\-]+(?<!\.atom)/ } do
+ member do
+ get :issues
+ get :merge_requests
+ get :projects
+ get :activity
+ end
- scope module: :groups do
- resources :group_members, only: [:index, :create, :update, :destroy], concerns: :access_requestable do
- post :resend_invite, on: :member
- delete :leave, on: :collection
- end
+ scope module: :groups do
+ resources :group_members, only: [:index, :create, :update, :destroy], concerns: :access_requestable do
+ post :resend_invite, on: :member
+ delete :leave, on: :collection
+ end
- resource :avatar, only: [:destroy]
- resources :milestones, constraints: { id: /[^\/]+/ }, only: [:index, :show, :update, :new, :create]
+ resource :avatar, only: [:destroy]
+ resources :milestones, constraints: { id: /[^\/]+/ }, only: [:index, :show, :update, :new, :create]
- resources :labels, except: [:show], constraints: { id: /\d+/ }
- end
+ resources :labels, except: [:show], constraints: { id: /\d+/ }
end
- get 'groups/:id' => 'groups#show', as: :group_canonical
end