diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-14 12:18:55 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-14 12:18:55 +0000 |
commit | 8a70817cd9327a4cdfbd71a11f9aa22e838fabf6 (patch) | |
tree | 33ea54e2a4cfaa0f0b7e2a65e433d99f28dbf4cf /app/graphql/resolvers | |
parent | 7bd8f9822b05eb2e8c8279678e38e7513c3612f6 (diff) | |
download | gitlab-ce-8a70817cd9327a4cdfbd71a11f9aa22e838fabf6.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/graphql/resolvers')
-rw-r--r-- | app/graphql/resolvers/base_issues_resolver.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/graphql/resolvers/base_issues_resolver.rb b/app/graphql/resolvers/base_issues_resolver.rb index 3983a3697cb..3e7509b4068 100644 --- a/app/graphql/resolvers/base_issues_resolver.rb +++ b/app/graphql/resolvers/base_issues_resolver.rb @@ -48,7 +48,8 @@ module Resolvers labels: [:labels], assignees: [:assignees], timelogs: [:timelogs], - customer_relations_contacts: { customer_relations_contacts: [:group] } + customer_relations_contacts: { customer_relations_contacts: [:group] }, + escalation_status: [:incident_management_issuable_escalation_status] } end |