diff options
author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-12-15 15:42:16 +0300 |
---|---|---|
committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-12-15 15:42:16 +0300 |
commit | c7db5b3efa2e02c580bf60be78780103847e4ba4 (patch) | |
tree | 4e195219b747fc6602cba1188289b638375d8607 /config | |
parent | 70c0a76cad4c7ce5656c97ac81b4caa21318e961 (diff) | |
parent | 677e7e837e3fb41deb46cb77de8b9395d031c07c (diff) |
Merge branch 'master' into auto-pipelines-vue
* master: (73 commits)
Remove pages/snippets css
Remove unused bootstrap imports
Shift emojis and icons styles into framework
Introduce deployment services, starting with a KubernetesService
Username exists check respects the relative root URL
add node_modules to our eslintignore settings
Remove white space between nav items
fix transient timing failure adding timecop
Improve build status specs contexts descriptions
Add some missing tests for detailed status methods
Fix wrong error message expectation in API::Commits spec
resolve all instances of no-undef eslint rule violations
Remove trailing blank line from Allowable module
expand remaining non-explicit eslint-disable blocks and factor ...
Introduce $CI_BUILD_REF_SLUG
Finish refactoring grays
Combining more grays
Remove duplicate shades of gray and black
Encode when migrating ProcessCommitWorker jobs
Prevent overflow with vertical scroll when we have space to show ...
...
Diffstat (limited to 'config')
-rw-r--r-- | config/routes/admin.rb | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/config/routes/admin.rb b/config/routes/admin.rb index 5ae985da561..0dd2c8f7aef 100644 --- a/config/routes/admin.rb +++ b/config/routes/admin.rb @@ -28,9 +28,19 @@ namespace :admin do resources :applications - resources :groups, constraints: { id: /[^\/]+/ } do - member do + resources :groups, only: [:index, :new, :create] + + scope(path: 'groups/*id', + controller: :groups, + constraints: { id: Gitlab::Regex.namespace_route_regex }) do + + scope(as: :group) do put :members_update + get :edit, action: :edit + get '/', action: :show + patch '/', action: :update + put '/', action: :update + delete '/', action: :destroy end end @@ -50,14 +60,13 @@ namespace :admin do resource :system_info, controller: 'system_info', only: [:show] resources :requests_profiles, only: [:index, :show], param: :name, constraints: { name: /.+\.html/ } - resources :namespaces, path: '/projects', constraints: { id: /[a-zA-Z.0-9_\-]+/ }, only: [] do - root to: 'projects#index', as: :projects + resources :projects, only: [:index] + scope(path: 'projects/*namespace_id', as: :namespace) do resources(:projects, path: '/', - constraints: { id: /[a-zA-Z.0-9_\-]+/ }, - only: [:index, :show]) do - root to: 'projects#show' + constraints: { id: Gitlab::Regex.project_route_regex }, + only: [:show]) do member do put :transfer |