summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2019-06-04 12:11:43 +0000
committerNick Thomas <nick@gitlab.com>2019-06-04 12:11:43 +0000
commit0d66701d2513b08b2976f53a91e0b710608650d6 (patch)
treee6984b36b73e489c258ae7692847f7a33ba3f9a3
parent6eee9335c4576b908941a8aab5cb0f7588a2d14d (diff)
parent4e251d01de8014a494049710ac27146a3f049d89 (diff)
downloadgitlab-ce-0d66701d2513b08b2976f53a91e0b710608650d6.tar.gz
Merge branch 'ac-graphql-wikisize' into 'master'
Expose wiki_size on GraphQL API See merge request gitlab-org/gitlab-ce!29123
-rw-r--r--app/graphql/types/project_statistics_type.rb1
-rw-r--r--changelogs/unreleased/ac-graphql-wikisize.yml5
-rw-r--r--spec/graphql/types/project_statistics_type_spec.rb3
3 files changed, 8 insertions, 1 deletions
diff --git a/app/graphql/types/project_statistics_type.rb b/app/graphql/types/project_statistics_type.rb
index 35ae23c21fc..62537361918 100644
--- a/app/graphql/types/project_statistics_type.rb
+++ b/app/graphql/types/project_statistics_type.rb
@@ -11,5 +11,6 @@ module Types
field :lfs_objects_size, GraphQL::INT_TYPE, null: false
field :build_artifacts_size, GraphQL::INT_TYPE, null: false
field :packages_size, GraphQL::INT_TYPE, null: false
+ field :wiki_size, GraphQL::INT_TYPE, null: true
end
end
diff --git a/changelogs/unreleased/ac-graphql-wikisize.yml b/changelogs/unreleased/ac-graphql-wikisize.yml
new file mode 100644
index 00000000000..be9c347ec21
--- /dev/null
+++ b/changelogs/unreleased/ac-graphql-wikisize.yml
@@ -0,0 +1,5 @@
+---
+title: Expose wiki_size on GraphQL API
+merge_request: 29123
+author:
+type: added
diff --git a/spec/graphql/types/project_statistics_type_spec.rb b/spec/graphql/types/project_statistics_type_spec.rb
index 485e194edb1..e9feac57a36 100644
--- a/spec/graphql/types/project_statistics_type_spec.rb
+++ b/spec/graphql/types/project_statistics_type_spec.rb
@@ -5,6 +5,7 @@ require 'spec_helper'
describe GitlabSchema.types['ProjectStatistics'] do
it "has all the required fields" do
is_expected.to have_graphql_fields(:storage_size, :repository_size, :lfs_objects_size,
- :build_artifacts_size, :packages_size, :commit_count)
+ :build_artifacts_size, :packages_size, :commit_count,
+ :wiki_size)
end
end