Commit c5eecb95 authored by Francisco Javier López's avatar Francisco Javier López

Merge branch 'vij-billable-count-gql' into 'master'

Add billable members count to group type

See merge request gitlab-org/gitlab!57712
parents 6aa28c22 87beb552
...@@ -3064,6 +3064,7 @@ Autogenerated return type of GitlabSubscriptionActivate. ...@@ -3064,6 +3064,7 @@ Autogenerated return type of GitlabSubscriptionActivate.
| `additionalPurchasedStorageSize` | [`Float`](#float) | Additional storage purchased for the root namespace in bytes. | | `additionalPurchasedStorageSize` | [`Float`](#float) | Additional storage purchased for the root namespace in bytes. |
| `autoDevopsEnabled` | [`Boolean`](#boolean) | Indicates whether Auto DevOps is enabled for all projects within this group. | | `autoDevopsEnabled` | [`Boolean`](#boolean) | Indicates whether Auto DevOps is enabled for all projects within this group. |
| `avatarUrl` | [`String`](#string) | Avatar URL of the group. | | `avatarUrl` | [`String`](#string) | Avatar URL of the group. |
| `billableMembersCount` | [`Int`](#int) | The number of billable users in the group. |
| `board` | [`Board`](#board) | A single board of the group. | | `board` | [`Board`](#board) | A single board of the group. |
| `boards` | [`BoardConnection`](#boardconnection) | Boards of the group. | | `boards` | [`BoardConnection`](#boardconnection) | Boards of the group. |
| `codeCoverageActivities` | [`CodeCoverageActivityConnection`](#codecoverageactivityconnection) | Represents the code coverage activity for this group. | | `codeCoverageActivities` | [`CodeCoverageActivityConnection`](#codecoverageactivityconnection) | Represents the code coverage activity for this group. |
......
...@@ -89,6 +89,10 @@ module EE ...@@ -89,6 +89,10 @@ module EE
null: true, null: true,
description: 'Group statistics.', description: 'Group statistics.',
method: :itself method: :itself
field :billable_members_count, ::GraphQL::INT_TYPE,
null: true,
description: 'The number of billable users in the group.'
end end
end end
end end
......
---
title: Add billable_members_count to GraphQL Group type
merge_request: 57712
author:
type: changed
...@@ -20,6 +20,7 @@ RSpec.describe GitlabSchema.types['Group'] do ...@@ -20,6 +20,7 @@ RSpec.describe GitlabSchema.types['Group'] do
it { expect(described_class).to have_graphql_field(:vulnerability_grades) } it { expect(described_class).to have_graphql_field(:vulnerability_grades) }
it { expect(described_class).to have_graphql_field(:code_coverage_activities) } it { expect(described_class).to have_graphql_field(:code_coverage_activities) }
it { expect(described_class).to have_graphql_field(:stats) } it { expect(described_class).to have_graphql_field(:stats) }
it { expect(described_class).to have_graphql_field(:billable_members_count) }
describe 'timelogs field' do describe 'timelogs field' do
subject { described_class.fields['timelogs'] } subject { described_class.fields['timelogs'] }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment