Merge branch 'ee_issue_928_backport' into 'master'

Group boards CE backport

See merge request !13883

2 files changed, 14 insertions, 13 deletions

diff --git a/config/routes.rb b/config/routes.rb
index ce7ab1d20f6..5683725c8a2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -74,6 +74,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 a15e7f8a344..b36d13888cd 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -343,19 +343,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]