Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42

2 files changed, 2 insertions, 6 deletions

diff --git a/app/services/boards/base_item_move_service.rb b/app/services/boards/base_item_move_service.rb
index be16c595abb..9d711d83fd2 100644
--- a/app/services/boards/base_item_move_service.rb
+++ b/app/services/boards/base_item_move_service.rb
@@ -39,7 +39,7 @@ module Boards
     end
 
     def reposition_params(reposition_ids)
-      reposition_parent.merge(move_between_ids: reposition_ids)
+      { move_between_ids: reposition_ids }
     end
 
     def move_single_issuable(issuable, issuable_modification_params)
@@ -91,7 +91,7 @@ module Boards
     end
 
     def move_between_ids(move_params)
-      ids = [move_params[:move_after_id], move_params[:move_before_id]]
+      ids = [move_params[:move_before_id], move_params[:move_after_id]]
               .map(&:to_i)
               .map { |m| m > 0 ? m : nil }
 
diff --git a/app/services/boards/issues/move_service.rb b/app/services/boards/issues/move_service.rb
index 959a7fa3ad2..90226b9d4e0 100644
--- a/app/services/boards/issues/move_service.rb
+++ b/app/services/boards/issues/move_service.rb
@@ -54,10 +54,6 @@ module Boards
       def update(issue, issue_modification_params)
         ::Issues::UpdateService.new(project: issue.project, current_user: current_user, params: issue_modification_params).execute(issue)
       end
-
-      def reposition_parent
-        { board_group_id: board.group&.id }
-      end
     end
   end
 end