diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-16 00:08:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-16 00:08:35 +0300 |
commit | ecfcccb684722316df4cd6c999a2716b44413733 (patch) | |
tree | 31d5fe9dd2b7b74a0b7e666752a8fae27d2fb593 /app/graphql | |
parent | 3caf5a8a007d8d9e9a86b7c847b5d9cfa6d41843 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/graphql')
-rw-r--r-- | app/graphql/resolvers/alert_management/alert_resolver.rb | 3 | ||||
-rw-r--r-- | app/graphql/types/alert_management/alert_type.rb | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/app/graphql/resolvers/alert_management/alert_resolver.rb b/app/graphql/resolvers/alert_management/alert_resolver.rb index 237f0b8999d..71a7615685a 100644 --- a/app/graphql/resolvers/alert_management/alert_resolver.rb +++ b/app/graphql/resolvers/alert_management/alert_resolver.rb @@ -33,7 +33,8 @@ module Resolvers def preloads { - assignees: [:assignees] + assignees: [:assignees], + notes: [:ordered_notes, { ordered_notes: [:system_note_metadata, :project, :noteable] }] } end end diff --git a/app/graphql/types/alert_management/alert_type.rb b/app/graphql/types/alert_management/alert_type.rb index cb55a9323b1..8215ccb152c 100644 --- a/app/graphql/types/alert_management/alert_type.rb +++ b/app/graphql/types/alert_management/alert_type.rb @@ -91,10 +91,8 @@ module Types null: true, description: 'Assignees of the alert' - def assignees - return User.none unless Feature.enabled?(:alert_assignee, object.project) - - object.assignees + def notes + object.ordered_notes end end end |