diff options
| author | blackst0ne <blackst0ne.ru@gmail.com> | 2018-04-07 17:02:45 +1100 |
|---|---|---|
| committer | blackst0ne <blackst0ne.ru@gmail.com> | 2018-04-07 17:02:45 +1100 |
| commit | b8c098ecfa68f515ce76dba129c3f0ac3b3638b9 (patch) | |
| tree | 56c879946129f6b4b79166b95a6c45db90e0e9df | |
| parent | aade8b3652573db40e7b777c72caa922b0bc12ef (diff) | |
| download | gitlab-ce-b8c098ecfa68f515ce76dba129c3f0ac3b3638b9.tar.gz | |
[Rails5] Fix spec/requests/projects/cycle_analytics_events_spec.rb
| -rw-r--r-- | Gemfile.rails5.lock | 4 | ||||
| -rw-r--r-- | 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) |