1 files changed, 9 insertions, 13 deletions

diff --git a/app/services/issues/update_service.rb b/app/services/issues/update_service.rb
index deb4990eb4f..1b7b5927c5a 100644
--- a/app/services/issues/update_service.rb
+++ b/app/services/issues/update_service.rb
@@ -3,7 +3,7 @@ module Issues
     include SpamCheckService
 
     def execute(issue)
-      handle_move_between_iids(issue)
+      handle_move_between_ids(issue)
       filter_spam_check_params
       change_issue_duplicate(issue)
       move_issue_to_new_project(issue) || update(issue)
@@ -27,14 +27,10 @@ module Issues
         todo_service.update_issue(issue, current_user, old_mentioned_users)
       end
 
-      if issue.previous_changes.include?('milestone_id')
-        create_milestone_note(issue)
-      end
-
       if issue.assignees != old_assignees
         create_assignee_note(issue, old_assignees)
         notification_service.reassigned_issue(issue, current_user, old_assignees)
-        todo_service.reassigned_issue(issue, current_user)
+        todo_service.reassigned_issue(issue, current_user, old_assignees)
       end
 
       if issue.previous_changes.include?('confidential')
@@ -54,13 +50,13 @@ module Issues
       end
     end
 
-    def handle_move_between_iids(issue)
-      return unless params[:move_between_iids]
+    def handle_move_between_ids(issue)
+      return unless params[:move_between_ids]
 
-      after_iid, before_iid = params.delete(:move_between_iids)
+      after_id, before_id = params.delete(:move_between_ids)
 
-      issue_before = get_issue_if_allowed(issue.project, before_iid) if before_iid
-      issue_after = get_issue_if_allowed(issue.project, after_iid) if after_iid
+      issue_before = get_issue_if_allowed(issue.project, before_id) if before_id
+      issue_after = get_issue_if_allowed(issue.project, after_id) if after_id
 
       issue.move_between(issue_before, issue_after)
     end
@@ -87,8 +83,8 @@ module Issues
 
     private
 
-    def get_issue_if_allowed(project, iid)
-      issue = project.issues.find_by(iid: iid)
+    def get_issue_if_allowed(project, id)
+      issue = project.issues.find(id)
       issue if can?(current_user, :update_issue, issue)
     end