summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-04-09 11:20:32 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-04-09 11:20:32 +0000
commitde36ca81d35992c265cd4fd09c774cb793dbd246 (patch)
tree3ad67701d063900418c1a9e1d8b577d699359af7
parentf22df3e9c1c590874cea8d50ab10f28467baaf18 (diff)
parent58dd4a095fc44a5ed015618a833e1fb806fdf457 (diff)
downloadgitlab-ce-de36ca81d35992c265cd4fd09c774cb793dbd246.tar.gz
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
-rw-r--r--app/services/notification_recipient_service.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/services/notification_recipient_service.rb b/app/services/notification_recipient_service.rb
index e4be953e810..b82d9c64296 100644
--- a/app/services/notification_recipient_service.rb
+++ b/app/services/notification_recipient_service.rb
@@ -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