From b8c098ecfa68f515ce76dba129c3f0ac3b3638b9 Mon Sep 17 00:00:00 2001
From: blackst0ne <blackst0ne.ru@gmail.com>
Date: Sat, 7 Apr 2018 17:02:45 +1100
Subject: [PATCH 1/2] [Rails5] Fix
 spec/requests/projects/cycle_analytics_events_spec.rb

---
 Gemfile.rails5.lock                            | 4 ++--
 app/services/notification_recipient_service.rb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock
index 08ae3fb514c..223d9e91a9b 100644
--- a/Gemfile.rails5.lock
+++ b/Gemfile.rails5.lock
@@ -291,7 +291,7 @@ GEM
       po_to_json (>= 1.0.0)
       rails (>= 3.2.0)
     gherkin-ruby (0.3.2)
-    gitaly-proto (0.91.0)
+    gitaly-proto (0.94.0)
       google-protobuf (~> 3.1)
       grpc (~> 1.0)
     github-linguist (5.3.3)
@@ -1062,7 +1062,7 @@ DEPENDENCIES
   gettext (~> 3.2.2)
   gettext_i18n_rails (~> 1.8.0)
   gettext_i18n_rails_js (~> 1.3)
-  gitaly-proto (~> 0.91.0)
+  gitaly-proto (~> 0.94.0)
   github-linguist (~> 5.3.3)
   gitlab-flowdock-git-hook (~> 1.0.1)
   gitlab-markup (~> 1.6.2)
diff --git a/app/services/notification_recipient_service.rb b/app/services/notification_recipient_service.rb
index e4be953e810..ed070cfaa54 100644
--- a/app/services/notification_recipient_service.rb
+++ b/app/services/notification_recipient_service.rb
@@ -51,7 +51,7 @@ module NotificationRecipientService
 
       def add_recipients(users, type, reason)
         if users.is_a?(ActiveRecord::Relation)
-          users = users.includes(:notification_settings)
+          users = users.includes(:notification_settings).to_a
         end
 
         users = Array(users)

From 58dd4a095fc44a5ed015618a833e1fb806fdf457 Mon Sep 17 00:00:00 2001
From: blackst0ne <blackst0ne.ru@gmail.com>
Date: Mon, 9 Apr 2018 19:16:40 +1100
Subject: [PATCH 2/2] Refactor `add_recipients`

---
 app/services/notification_recipient_service.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/services/notification_recipient_service.rb b/app/services/notification_recipient_service.rb
index ed070cfaa54..b82d9c64296 100644
--- a/app/services/notification_recipient_service.rb
+++ b/app/services/notification_recipient_service.rb
@@ -51,11 +51,10 @@ module NotificationRecipientService
 
       def add_recipients(users, type, reason)
         if users.is_a?(ActiveRecord::Relation)
-          users = users.includes(:notification_settings).to_a
+          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