diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 07:08:36 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 07:08:36 +0000 |
commit | 48aff82709769b098321c738f3444b9bdaa694c6 (patch) | |
tree | e00c7c43e2d9b603a5a6af576b1685e400410dee /app/graphql/types/group_type.rb | |
parent | 879f5329ee916a948223f8f43d77fba4da6cd028 (diff) | |
download | gitlab-ce-48aff82709769b098321c738f3444b9bdaa694c6.tar.gz |
Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42
Diffstat (limited to 'app/graphql/types/group_type.rb')
-rw-r--r-- | app/graphql/types/group_type.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/app/graphql/types/group_type.rb b/app/graphql/types/group_type.rb index 60b2e3c7b6e..199cc0308c5 100644 --- a/app/graphql/types/group_type.rb +++ b/app/graphql/types/group_type.rb @@ -46,9 +46,15 @@ module Types field :issues, Types::IssueType.connection_type, null: true, - description: 'Issues of the group', + description: 'Issues for projects in this group', resolver: Resolvers::GroupIssuesResolver + field :merge_requests, + Types::MergeRequestType.connection_type, + null: true, + description: 'Merge requests for projects in this group', + resolver: Resolvers::GroupMergeRequestsResolver + field :milestones, Types::MilestoneType.connection_type, null: true, description: 'Milestones of the group', resolver: Resolvers::GroupMilestonesResolver @@ -64,7 +70,7 @@ module Types Types::BoardType, null: true, description: 'A single board of the group', - resolver: Resolvers::BoardsResolver.single + resolver: Resolvers::BoardResolver field :label, Types::LabelType, |