Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42

5 files changed, 80 insertions, 71 deletions

diff --git a/app/services/boards/create_service.rb b/app/services/boards/create_service.rb
index 2ccaea64d14..54dab581686 100644
--- a/app/services/boards/create_service.rb
+++ b/app/services/boards/create_service.rb
@@ -13,11 +13,11 @@ module Boards
     private
 
     def can_create_board?
-      parent.boards.empty? || parent.multiple_issue_boards_available?
+      parent_board_collection.empty? || parent.multiple_issue_boards_available?
     end
 
     def create_board!
-      board = parent.boards.create(params)
+      board = parent_board_collection.create(params)
 
       unless board.persisted?
         return ServiceResponse.error(message: "There was an error when creating a board.", payload: board)
@@ -30,6 +30,10 @@ module Boards
 
       ServiceResponse.success(payload: board)
     end
+
+    def parent_board_collection
+      parent.boards
+    end
   end
 end
 
diff --git a/app/services/boards/list_service.rb b/app/services/boards/list_service.rb
index 729bca6580e..80ceb91f56d 100644
--- a/app/services/boards/list_service.rb
+++ b/app/services/boards/list_service.rb
@@ -2,9 +2,7 @@
 
 module Boards
   class ListService < Boards::BaseService
-    def execute(create_default_board: true)
-      create_board! if create_default_board && parent.boards.empty?
-
+    def execute
       find_boards
     end
 
@@ -18,10 +16,6 @@ module Boards
       parent.boards.first_board
     end
 
-    def create_board!
-      Boards::CreateService.new(parent, current_user).execute
-    end
-
     def find_boards
       found =
         if parent.multiple_issue_boards_available?
diff --git a/app/services/boards/lists/base_create_service.rb b/app/services/boards/lists/base_create_service.rb
new file mode 100644
index 00000000000..8399b1cc149
--- /dev/null
+++ b/app/services/boards/lists/base_create_service.rb
@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+module Boards
+  module Lists
+    # This class is used by issue and epic board lists
+    # for creating new list
+    class BaseCreateService < Boards::BaseService
+      include Gitlab::Utils::StrongMemoize
+
+      def execute(board)
+        list = case type
+               when :backlog
+                 create_backlog(board)
+               else
+                 target = target(board)
+                 position = next_position(board)
+
+                 return ServiceResponse.error(message: _('%{board_target} not found') % { board_target: type.to_s.capitalize }) if target.blank?
+
+                 create_list(board, type, target, position)
+               end
+
+        return ServiceResponse.error(message: list.errors.full_messages) unless list.persisted?
+
+        ServiceResponse.success(payload: { list: list })
+      end
+
+      private
+
+      def type
+        # We don't ever expect to have more than one list
+        # type param at once.
+        if params.key?('backlog')
+          :backlog
+        else
+          :label
+        end
+      end
+
+      def target(board)
+        strong_memoize(:target) do
+          available_labels.find_by(id: params[:label_id]) # rubocop: disable CodeReuse/ActiveRecord
+        end
+      end
+
+      def available_labels
+        ::Labels::AvailableLabelsService.new(current_user, parent, {})
+          .available_labels
+      end
+
+      def next_position(board)
+        max_position = board.lists.movable.maximum(:position)
+        max_position.nil? ? 0 : max_position.succ
+      end
+
+      def create_list(board, type, target, position)
+        board.lists.create(create_list_attributes(type, target, position))
+      end
+
+      def create_list_attributes(type, target, position)
+        { type => target, list_type: type, position: position }
+      end
+
+      def create_backlog(board)
+        return board.lists.backlog.first if board.lists.backlog.exists?
+
+        board.lists.create(list_type: :backlog, position: nil)
+      end
+    end
+  end
+end
diff --git a/app/services/boards/lists/create_service.rb b/app/services/boards/lists/create_service.rb
index a21ceee083f..37fe0a815bd 100644
--- a/app/services/boards/lists/create_service.rb
+++ b/app/services/boards/lists/create_service.rb
@@ -2,68 +2,7 @@
 
 module Boards
   module Lists
-    class CreateService < Boards::BaseService
-      include Gitlab::Utils::StrongMemoize
-
-      def execute(board)
-        list = case type
-               when :backlog
-                 create_backlog(board)
-               else
-                 target = target(board)
-                 position = next_position(board)
-
-                 return ServiceResponse.error(message: _('%{board_target} not found') % { board_target: type.to_s.capitalize }) if target.blank?
-
-                 create_list(board, type, target, position)
-               end
-
-        return ServiceResponse.error(message: list.errors.full_messages) unless list.persisted?
-
-        ServiceResponse.success(payload: { list: list })
-      end
-
-      private
-
-      def type
-        # We don't ever expect to have more than one list
-        # type param at once.
-        if params.key?('backlog')
-          :backlog
-        else
-          :label
-        end
-      end
-
-      def target(board)
-        strong_memoize(:target) do
-          available_labels.find_by(id: params[:label_id]) # rubocop: disable CodeReuse/ActiveRecord
-        end
-      end
-
-      def available_labels
-        ::Labels::AvailableLabelsService.new(current_user, parent, {})
-          .available_labels
-      end
-
-      def next_position(board)
-        max_position = board.lists.movable.maximum(:position)
-        max_position.nil? ? 0 : max_position.succ
-      end
-
-      def create_list(board, type, target, position)
-        board.lists.create(create_list_attributes(type, target, position))
-      end
-
-      def create_list_attributes(type, target, position)
-        { type => target, list_type: type, position: position }
-      end
-
-      def create_backlog(board)
-        return board.lists.backlog.first if board.lists.backlog.exists?
-
-        board.lists.create(list_type: :backlog, position: nil)
-      end
+    class CreateService < Boards::Lists::BaseCreateService
     end
   end
 end
diff --git a/app/services/boards/visits/create_service.rb b/app/services/boards/visits/create_service.rb
index e2adf755511..428ed1a8bcc 100644
--- a/app/services/boards/visits/create_service.rb
+++ b/app/services/boards/visits/create_service.rb
@@ -5,6 +5,7 @@ module Boards
     class CreateService < Boards::BaseService
       def execute(board)
         return unless current_user && Gitlab::Database.read_write?
+        return unless board.is_a?(Board) # other board types do not support board visits yet
 
         if parent.is_a?(Group)
           BoardGroupRecentVisit.visited!(current_user, board)