1 files changed, 16 insertions, 0 deletions

diff --git a/app/services/issues/base_service.rb b/app/services/issues/base_service.rb
index 37d667d4be8..61a95e49228 100644
--- a/app/services/issues/base_service.rb
+++ b/app/services/issues/base_service.rb
@@ -2,6 +2,7 @@
 
 module Issues
   class BaseService < ::IssuableBaseService
+    extend ::Gitlab::Utils::Override
     include IncidentManagement::UsageData
     include IssueTypeHelpers
 
@@ -61,6 +62,21 @@ module Issues
       issue.system_note_timestamp = params[:created_at] || params[:updated_at]
     end
 
+    override :handle_move_between_ids
+    def handle_move_between_ids(issue)
+      issue.check_repositioning_allowed! if params[:move_between_ids]
+
+      super
+
+      rebalance_if_needed(issue)
+    end
+
+    def issuable_for_positioning(id, positioning_scope)
+      return unless id
+
+      positioning_scope.find(id)
+    end
+
     def create_assignee_note(issue, old_assignees)
       SystemNoteService.change_issuable_assignees(
         issue, issue.project, current_user, old_assignees)