Add latest changes from gitlab-org/gitlab@master

3 files changed, 6 insertions, 18 deletions

diff --git a/app/graphql/resolvers/concerns/issue_resolver_arguments.rb b/app/graphql/resolvers/concerns/issue_resolver_arguments.rb
index 432d6f48607..de44dbb26d7 100644
--- a/app/graphql/resolvers/concerns/issue_resolver_arguments.rb
+++ b/app/graphql/resolvers/concerns/issue_resolver_arguments.rb
@@ -68,6 +68,12 @@ module IssueResolverArguments
              description: 'Negated arguments.',
              prepare: ->(negated_args, ctx) { negated_args.to_h },
              required: false
+    argument :crm_contact_id, GraphQL::Types::String,
+             required: false,
+             description: 'ID of a contact assigned to the issues.'
+    argument :crm_organization_id, GraphQL::Types::String,
+             required: false,
+             description: 'ID of an organization assigned to the issues.'
   end
 
   def resolve_with_lookahead(**args)
diff --git a/app/graphql/types/packages/package_type.rb b/app/graphql/types/packages/package_type.rb
index 1155be28e08..41c6dde20a9 100644
--- a/app/graphql/types/packages/package_type.rb
+++ b/app/graphql/types/packages/package_type.rb
@@ -27,18 +27,11 @@ module Types
       field :tags, Types::Packages::PackageTagType.connection_type, null: true, description: 'Package tags.'
       field :updated_at, Types::TimeType, null: false, description: 'Date of most recent update.'
       field :version, GraphQL::Types::String, null: true, description: 'Version string.'
-      field :versions, ::Types::Packages::PackageType.connection_type, null: true,
-        description: 'Other versions of the package.',
-        deprecated: { reason: 'This field is now only returned in the PackageDetailsType', milestone: '13.11' }
 
       def project
         Gitlab::Graphql::Loaders::BatchModelLoader.new(Project, object.project_id).find
       end
 
-      def versions
-        []
-      end
-
       def can_destroy
         Ability.allowed?(current_user, :destroy_package, object)
       end
diff --git a/app/graphql/types/query_type.rb b/app/graphql/types/query_type.rb
index cc46c7e86e4..a1e73670bc9 100644
--- a/app/graphql/types/query_type.rb
+++ b/app/graphql/types/query_type.rb
@@ -99,17 +99,6 @@ module Types
             argument :id, ::Types::GlobalIDType[::MergeRequest], required: true, description: 'Global ID of the merge request.'
           end
 
-    field :instance_statistics_measurements,
-          type: Types::Admin::Analytics::UsageTrends::MeasurementType.connection_type,
-          null: true,
-          description: 'Get statistics on the instance.',
-          resolver: Resolvers::Admin::Analytics::UsageTrends::MeasurementsResolver,
-          deprecated: {
-            reason: :renamed,
-            replacement: 'Query.usageTrendsMeasurements',
-            milestone: '13.10'
-          }
-
     field :usage_trends_measurements, Types::Admin::Analytics::UsageTrends::MeasurementType.connection_type,
           null: true,
           description: 'Get statistics on the instance.',