diff options
author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-12-07 18:10:53 +0300 |
---|---|---|
committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-12-07 18:10:53 +0300 |
commit | ad19de19498a1337a242fd67731e59771e65a9d3 (patch) | |
tree | c94ae4edbc65748118f6a32b26b52e5abc9f7dbe /config | |
parent | f55fcef3dbadf5f3003e0a51633e30e05b47c51d (diff) | |
parent | e09c6df0682c499e221a0da41ac263482fbcf568 (diff) |
Merge branch 'master' into auto-pipelines-vue
* master: (114 commits)
Remove dashboard.scss
Update custom_hooks.md for global custom hooks and chained hook info
Move admin hooks spinach to rspec
Move admin logs spinach test to rspec
Fix 404 error when visit group label edit page
A simpler implementation of finding a merge request
Encourage bug reporters to mention if they use GitLab.com
Bump gitlab-shell version to 4.0.3
Remove confirmation.scss
Explain "js: true" in "deleted_source_branch_spec.rb"
Move award emojis to framwork
Move image styles to framework
Remove tags.scss
Remove caching of Repository#has_visible_content?
Add text example for pipeline status without action
Use detailed status as CSS class in pipelines list
Use status text when redering pipelines list
Improve support for icons in new detailed statuses
Add status label information to pipeline header
Untangle status label and text in ci status helper
...
Diffstat (limited to 'config')
-rw-r--r-- | config/routes/group.rb | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/config/routes/group.rb b/config/routes/group.rb index 9fe72990994..776c31c9dac 100644 --- a/config/routes/group.rb +++ b/config/routes/group.rb @@ -1,15 +1,5 @@ resources :groups, only: [:index, :new, :create] -scope(path: 'groups/*id', - controller: :groups, - constraints: { id: Gitlab::Regex.namespace_route_regex }) do - get :edit, as: :edit_group - get :issues, as: :issues_group - get :merge_requests, as: :merge_requests_group - get :projects, as: :projects_group - get :activity, as: :activity_group -end - scope(path: 'groups/*group_id', module: :groups, as: :group, @@ -22,10 +12,20 @@ scope(path: 'groups/*group_id', resource :avatar, only: [:destroy] resources :milestones, constraints: { id: /[^\/]+/ }, only: [:index, :show, :update, :new, :create] - resources :labels, except: [:show], constraints: { id: /\d+/ } do + resources :labels, except: [:show] do post :toggle_subscription, on: :member end end +scope(path: 'groups/*id', + controller: :groups, + constraints: { id: Gitlab::Regex.namespace_route_regex }) do + get :edit, as: :edit_group + get :issues, as: :issues_group + get :merge_requests, as: :merge_requests_group + get :projects, as: :projects_group + get :activity, as: :activity_group +end + # Must be last route in this file get 'groups/*id' => 'groups#show', as: :group_canonical, constraints: { id: Gitlab::Regex.namespace_route_regex } |