summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorFelipe Artur <felipefac@gmail.com>2017-08-28 18:56:49 -0300
committerFelipe Artur <felipefac@gmail.com>2017-08-28 18:56:49 -0300
commitf2a43ff5b7eec188ffc470649bf40d268cbdce2a (patch)
treef9a59f5d83d883c482c9ebfe811580a0fc8f6be6 /config
parent5f88660a3f5d9f0de0109a3da46e81ea9024c677 (diff)
downloadgitlab-ce-f2a43ff5b7eec188ffc470649bf40d268cbdce2a.tar.gz
Group boards CE backport
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb13
-rw-r--r--config/routes/project.rb14
2 files changed, 14 insertions, 13 deletions
diff --git a/config/routes.rb b/config/routes.rb
index 4fd6cb5d439..5d7166cad9a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -73,6 +73,19 @@ Rails.application.routes.draw do
# Notification settings
resources :notification_settings, only: [:create, :update]
+ # Boards resources shared between group and projects
+ resources :boards do
+ resources :lists, module: :boards, only: [:index, :create, :update, :destroy] do
+ collection do
+ post :generate
+ end
+
+ resources :issues, only: [:index, :create, :update]
+ end
+
+ resources :issues, module: :boards, only: [:index, :update]
+ end
+
draw :import
draw :uploads
draw :explore
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 06928c7b9ce..3c7c218c356 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -341,19 +341,7 @@ constraints(ProjectUrlConstrainer.new) do
get 'noteable/:target_type/:target_id/notes' => 'notes#index', as: 'noteable_notes'
- resources :boards, only: [:index, :show] do
- scope module: :boards do
- resources :issues, only: [:index, :update]
-
- resources :lists, only: [:index, :create, :update, :destroy] do
- collection do
- post :generate
- end
-
- resources :issues, only: [:index, :create]
- end
- end
- end
+ resources :boards, only: [:index, :show, :create, :update, :destroy]
resources :todos, only: [:create]