diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2016-10-21 15:15:33 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-10-21 17:42:52 +0200 |
commit | e59383af8baabc9cda35128132027dacf553e62f (patch) | |
tree | e51b14fb0931e9972561a272b314571bf0cc4d45 /app | |
parent | 2f0fb20e4ce03e8ab40a1cf1db8e0884c786be9c (diff) | |
download | gitlab-ce-e59383af8baabc9cda35128132027dacf553e62f.tar.gz |
Merge branch 'fix-bulk-assign-issues-for-external-issues' into 'master'
Ignore external issues when bulk assigning issues to author of merge request.
Fixes #23552
See merge request !7020
Diffstat (limited to 'app')
-rw-r--r-- | app/services/merge_requests/assign_issues_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/merge_requests/assign_issues_service.rb b/app/services/merge_requests/assign_issues_service.rb index f636e5fec4f..066efa1acc3 100644 --- a/app/services/merge_requests/assign_issues_service.rb +++ b/app/services/merge_requests/assign_issues_service.rb @@ -4,7 +4,7 @@ module MergeRequests @assignable_issues ||= begin if current_user == merge_request.author closes_issues.select do |issue| - !issue.assignee_id? && can?(current_user, :admin_issue, issue) + !issue.is_a?(ExternalIssue) && !issue.assignee_id? && can?(current_user, :admin_issue, issue) end else [] |