Merge branch 'blackst0ne-rails5-fix-frozen-array' into 'master'

[Rails5] Fix `can't modify frozen Array` errors

See merge request gitlab-org/gitlab-ce!18239
This commit is contained in:
Sean McGivern 2018-04-09 11:20:32 +00:00
commit de36ca81d3
1 changed files with 1 additions and 2 deletions

View File

@ -54,8 +54,7 @@ module NotificationRecipientService
users = users.includes(:notification_settings)
end
users = Array(users)
users.compact!
users = Array(users).compact
recipients.concat(users.map { |u| make_recipient(u, type, reason) })
end