diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-10-17 10:03:03 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-10-17 10:03:03 +0000 |
| commit | 79e889122b9f1cb41eb75ee33e94e625a8c679e2 (patch) | |
| tree | eb8bba9933b3241b3ca80574bc47fc40d4f3950f /config | |
| parent | 3fa410c831dac1dd1a74a14260ed99a5920218f8 (diff) | |
| parent | 893402d477436d36b48c2fd0244576a0d16e9425 (diff) | |
| download | gitlab-ce-79e889122b9f1cb41eb75ee33e94e625a8c679e2.tar.gz | |
Merge branch 'bvl-group-trees' into 'master'
Show collapsible tree on the project show page
Closes #30343
See merge request gitlab-org/gitlab-ce!14055
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 1 | ||||
| -rw-r--r-- | config/routes/group.rb | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb index 31e91835b9e..5100ec5d2b7 100644 --- a/config/application.rb +++ b/config/application.rb @@ -29,6 +29,7 @@ module Gitlab #{config.root}/app/models/project_services #{config.root}/app/workers/concerns #{config.root}/app/services/concerns + #{config.root}/app/serializers/concerns #{config.root}/app/finders/concerns]) config.generators.templates.push("#{config.root}/generator_templates") diff --git a/config/routes/group.rb b/config/routes/group.rb index 8cc30bfcc50..702df5b7b5a 100644 --- a/config/routes/group.rb +++ b/config/routes/group.rb @@ -32,6 +32,8 @@ scope(path: 'groups/*group_id', end resources :variables, only: [:index, :show, :update, :create, :destroy] + + resources :children, only: [:index] end end @@ -43,7 +45,6 @@ scope(path: 'groups/*id', get :merge_requests, as: :merge_requests_group get :projects, as: :projects_group get :activity, as: :activity_group - get :subgroups, as: :subgroups_group get '/', action: :show, as: :group_canonical end |