diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 14:22:11 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 14:22:11 +0000 |
| commit | 0c872e02b2c822e3397515ec324051ff540f0cd5 (patch) | |
| tree | ce2fb6ce7030e4dad0f4118d21ab6453e5938cdd /app/services/merge_requests/assign_issues_service.rb | |
| parent | f7e05a6853b12f02911494c4b3fe53d9540d74fc (diff) | |
| download | gitlab-ce-f7d6ced4f57b4920a666336f5a44d098faade2ea.tar.gz | |
Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42
Diffstat (limited to 'app/services/merge_requests/assign_issues_service.rb')
| -rw-r--r-- | app/services/merge_requests/assign_issues_service.rb | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/app/services/merge_requests/assign_issues_service.rb b/app/services/merge_requests/assign_issues_service.rb index f016c16e816..c107280efb1 100644 --- a/app/services/merge_requests/assign_issues_service.rb +++ b/app/services/merge_requests/assign_issues_service.rb @@ -3,15 +3,13 @@ module MergeRequests class AssignIssuesService < BaseProjectService def assignable_issues - @assignable_issues ||= begin - if current_user == merge_request.author - closes_issues.select do |issue| - !issue.is_a?(ExternalIssue) && !issue.assignees.present? && can?(current_user, :admin_issue, issue) - end - else - [] - end - end + @assignable_issues ||= if current_user == merge_request.author + closes_issues.select do |issue| + !issue.is_a?(ExternalIssue) && !issue.assignees.present? && can?(current_user, :admin_issue, issue) + end + else + [] + end end def execute |