diff options
| author | Dennis Tang <dtang@gitlab.com> | 2018-05-31 11:28:48 +0200 |
|---|---|---|
| committer | Dennis Tang <dtang@gitlab.com> | 2018-05-31 11:28:48 +0200 |
| commit | d363014c36708864df09f39cb64415073a1430a0 (patch) | |
| tree | fbd3332dcf41a518c390b07d3bdcc7bef2cfdbec /config/routes | |
| parent | b4308842deb79c1364302188a41c6e37c14b62ec (diff) | |
| parent | 5b9edea9f16d57ef82f4a69eacd91c13d068583d (diff) | |
| download | gitlab-ce-d363014c36708864df09f39cb64415073a1430a0.tar.gz | |
Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabs
# Conflicts:
# app/controllers/projects/clusters/gcp_controller.rb
# app/views/projects/clusters/gcp/_form.html.haml
# app/views/projects/clusters/gcp/login.html.haml
Diffstat (limited to 'config/routes')
| -rw-r--r-- | config/routes/group.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/routes/group.rb b/config/routes/group.rb index 7c4c3d370e0..fff0914c3cd 100644 --- a/config/routes/group.rb +++ b/config/routes/group.rb @@ -30,6 +30,7 @@ constraints(::Constraints::GroupUrlConstrainer.new) do resource :variables, only: [:show, :update] resources :children, only: [:index] + resources :shared_projects, only: [:index] resources :labels, except: [:show] do post :toggle_subscription, on: :member |