1 files changed, 8 insertions, 11 deletions
diff --git a/app/services/boards/lists/generate_service.rb b/app/services/boards/lists/generate_service.rb
index 1c48b9786e4..939f9bfd068 100644
--- a/app/services/boards/lists/generate_service.rb
+++ b/app/services/boards/lists/generate_service.rb
@@ -1,11 +1,11 @@
 module Boards
   module Lists
-    class GenerateService < Boards::BaseService
-      def execute
+    class GenerateService < BaseService
+      def execute(board)
         return false unless board.lists.movable.empty?
 
         List.transaction do
-          label_params.each { |params| create_list(params) }
+          label_params.each { |params| create_list(board, params) }
         end
 
         true
@@ -13,22 +13,19 @@ module Boards
 
       private
 
-      def create_list(params)
+      def create_list(board, params)
         label = find_or_create_label(params)
-        Lists::CreateService.new(project, current_user, label_id: label.id).execute
+        Lists::CreateService.new(project, current_user, label_id: label.id).execute(board)
       end
 
       def find_or_create_label(params)
-        project.labels.create_with(color: params[:color])
-                      .find_or_create_by(name: params[:name])
+        ::Labels::FindOrCreateService.new(current_user, project, params).execute
       end
 
       def label_params
         [
-          { name: 'Development', color: '#5CB85C' },
-          { name: 'Testing',     color: '#F0AD4E' },
-          { name: 'Production',  color: '#FF5F00' },
-          { name: 'Ready',       color: '#FF0000' }
+          { name: 'To Do', color: '#F0AD4E' },
+          { name: 'Doing', color: '#5CB85C' }
         ]
       end
     end