Add latest changes from gitlab-org/gitlab@13-4-stable-ee

3 files changed, 46 insertions, 1 deletions

diff --git a/app/graphql/types/admin/analytics/instance_statistics/measurement_identifier_enum.rb b/app/graphql/types/admin/analytics/instance_statistics/measurement_identifier_enum.rb
new file mode 100644
index 00000000000..13c67442c2e
--- /dev/null
+++ b/app/graphql/types/admin/analytics/instance_statistics/measurement_identifier_enum.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Types
+  module Admin
+    module Analytics
+      module InstanceStatistics
+        class MeasurementIdentifierEnum < BaseEnum
+          graphql_name 'MeasurementIdentifier'
+          description 'Possible identifier types for a measurement'
+
+          value 'PROJECTS', 'Project count', value: :projects
+          value 'USERS', 'User count', value: :users
+          value 'ISSUES', 'Issue count', value: :issues
+          value 'MERGE_REQUESTS', 'Merge request count', value: :merge_requests
+          value 'GROUPS', 'Group count', value: :groups
+          value 'PIPELINES', 'Pipeline count', value: :pipelines
+        end
+      end
+    end
+  end
+end
diff --git a/app/graphql/types/admin/analytics/instance_statistics/measurement_type.rb b/app/graphql/types/admin/analytics/instance_statistics/measurement_type.rb
new file mode 100644
index 00000000000..d45341077a4
--- /dev/null
+++ b/app/graphql/types/admin/analytics/instance_statistics/measurement_type.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+# rubocop:disable Graphql/AuthorizeTypes
+
+module Types
+  module Admin
+    module Analytics
+      module InstanceStatistics
+        class MeasurementType < BaseObject
+          graphql_name 'InstanceStatisticsMeasurement'
+          description 'Represents a recorded measurement (object count) for the Admins'
+
+          field :recorded_at, Types::TimeType, null: true,
+                description: 'The time the measurement was recorded'
+
+          field :count, GraphQL::INT_TYPE, null: false,
+                description: 'Object count'
+
+          field :identifier, Types::Admin::Analytics::InstanceStatistics::MeasurementIdentifierEnum, null: false,
+                description: 'The type of objects being measured'
+        end
+      end
+    end
+  end
+end
diff --git a/app/graphql/types/admin/sidekiq_queues/delete_jobs_response_type.rb b/app/graphql/types/admin/sidekiq_queues/delete_jobs_response_type.rb
index 69af9d463bb..93dd49b3c38 100644
--- a/app/graphql/types/admin/sidekiq_queues/delete_jobs_response_type.rb
+++ b/app/graphql/types/admin/sidekiq_queues/delete_jobs_response_type.rb
@@ -7,7 +7,7 @@ module Types
       # a plain hash.
       class DeleteJobsResponseType < BaseObject # rubocop:disable Graphql/AuthorizeTypes
         graphql_name 'DeleteJobsResponse'
-        description 'The response from the AdminSidekiqQueuesDeleteJobs mutation.'
+        description 'The response from the AdminSidekiqQueuesDeleteJobs mutation'
 
         field :completed,
               GraphQL::BOOLEAN_TYPE,