summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-05-16 22:16:12 +0000
committerDouwe Maan <douwe@gitlab.com>2017-05-16 22:16:12 +0000
commitc7a7fc175d4004ec48aaef2f605043f92cbd941e (patch)
tree0bd32bf21533b3dd0929435f9305f2e713f078e9 /app
parent67312fceaa69abb2bc88aa62601625e9f6a62270 (diff)
parent793b9a5ced5f97feabca329e335f8ce7b1fb6708 (diff)
downloadgitlab-ce-c7a7fc175d4004ec48aaef2f605043f92cbd941e.tar.gz
Merge branch 'fix_assignee_yourick_approach' into 'master'
Improve migration for Multipple issue assignee feature See merge request !11417
Diffstat (limited to 'app')
-rw-r--r--app/services/members/authorized_destroy_service.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/members/authorized_destroy_service.rb b/app/services/members/authorized_destroy_service.rb
index 7912cac65d3..eac7ef0c9b7 100644
--- a/app/services/members/authorized_destroy_service.rb
+++ b/app/services/members/authorized_destroy_service.rb
@@ -29,7 +29,7 @@ module Members
issue_ids = IssuesFinder.new(user, group_id: member.source_id, assignee_id: member.user_id).
execute.pluck(:id)
- IssueAssignee.destroy_all(issue_id: issue_ids, user_id: member.user_id)
+ IssueAssignee.delete_all(issue_id: issue_ids, user_id: member.user_id)
MergeRequestsFinder.new(user, group_id: member.source_id, assignee_id: member.user_id).
execute.
@@ -37,7 +37,7 @@ module Members
else
project = member.source
- IssueAssignee.destroy_all(
+ IssueAssignee.delete_all(
user_id: member.user_id,
issue_id: project.issues.opened.assigned_to(member.user).select(:id)
)