diff --git a/app/graphql/resolvers/projects/services_resolver.rb b/app/graphql/resolvers/projects/services_resolver.rb index 99de4df945c98752f8cf59c50d24686301508ea8..3eca0dfd83f8674cedb23b3b6fdd3088e4c2ab43 100644 --- a/app/graphql/resolvers/projects/services_resolver.rb +++ b/app/graphql/resolvers/projects/services_resolver.rb @@ -2,6 +2,7 @@ module Resolvers module Projects + # TODO: Remove in 17.0, see https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108418 class ServicesResolver < BaseResolver include Gitlab::Graphql::Authorize::AuthorizeResource diff --git a/app/graphql/types/project_type.rb b/app/graphql/types/project_type.rb index d0c2c583f9f22ef04c3740688f330a7928077f80..def16887c5337739431757c90312de2a6b3f3127 100644 --- a/app/graphql/types/project_type.rb +++ b/app/graphql/types/project_type.rb @@ -393,6 +393,10 @@ class ProjectType < BaseObject field :services, Types::Projects::ServiceType.connection_type, null: true, + deprecated: { + reason: 'This will be renamed to `Project.integrations`', + milestone: '15.9' + }, description: 'Project services.', resolver: Resolvers::Projects::ServicesResolver diff --git a/app/graphql/types/projects/service_type.rb b/app/graphql/types/projects/service_type.rb index 1416d93d3b4f9c8d69b067931ba8b2f2cbec9c3a..ec58e3254aeed74641993efff79eaf8846d9ce3d 100644 --- a/app/graphql/types/projects/service_type.rb +++ b/app/graphql/types/projects/service_type.rb @@ -2,6 +2,7 @@ module Types module Projects + # TODO: Remove in 17.0, see https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108418 module ServiceType include Types::BaseInterface graphql_name 'Service' diff --git a/app/graphql/types/projects/service_type_enum.rb b/app/graphql/types/projects/service_type_enum.rb index d0cecbfea49ce899838317bc7840ceb626f7dc2c..fd88fa957e7b3b24a535ef4977adec8cb547234f 100644 --- a/app/graphql/types/projects/service_type_enum.rb +++ b/app/graphql/types/projects/service_type_enum.rb @@ -2,6 +2,7 @@ module Types module Projects + # TODO: Remove in 17.0, see https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108418 class ServiceTypeEnum < BaseEnum graphql_name 'ServiceType' diff --git a/app/graphql/types/projects/services/base_service_type.rb b/app/graphql/types/projects/services/base_service_type.rb index 5341ae2a864daa69d99e2e54992e329385a87e6b..9a48aafa5a8f5834144092660052cc3d8272b979 100644 --- a/app/graphql/types/projects/services/base_service_type.rb +++ b/app/graphql/types/projects/services/base_service_type.rb @@ -3,6 +3,7 @@ module Types module Projects module Services + # TODO: Remove in 17.0, see https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108418 class BaseServiceType < BaseObject graphql_name 'BaseService' diff --git a/app/graphql/types/projects/services/jira_project_type.rb b/app/graphql/types/projects/services/jira_project_type.rb index 1c5b97802e36ae1e0545902f02f94128f7a9ec33..eb721d02b36042bb0280e0bff5495c15ddbff00a 100644 --- a/app/graphql/types/projects/services/jira_project_type.rb +++ b/app/graphql/types/projects/services/jira_project_type.rb @@ -4,6 +4,7 @@ module Types module Projects module Services # rubocop:disable Graphql/AuthorizeTypes + # TODO: Remove in 17.0, see https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108418 class JiraProjectType < BaseObject graphql_name 'JiraProject' diff --git a/app/graphql/types/projects/services/jira_service_type.rb b/app/graphql/types/projects/services/jira_service_type.rb index 425a283c674f9b0205e553f6dcf204df01065000..ac274d7f890850d0ab5f1455170b191b7c840c99 100644 --- a/app/graphql/types/projects/services/jira_service_type.rb +++ b/app/graphql/types/projects/services/jira_service_type.rb @@ -3,6 +3,7 @@ module Types module Projects module Services + # TODO: Remove in 17.0, see https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108418 class JiraServiceType < BaseObject graphql_name 'JiraService' diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md index d01e8e3e7c3bd1b2f6371f16d521847392990fd6..febd69360273c84e38c5a510097e4b8ddc9344ac 100644 --- a/doc/api/graphql/reference/index.md +++ b/doc/api/graphql/reference/index.md @@ -18603,6 +18603,10 @@ Returns [`SentryDetailedError`](#sentrydetailederror). Project services. +WARNING: +**Deprecated** in 15.9. +This will be renamed to `Project.integrations`. + Returns [`ServiceConnection`](#serviceconnection). This field returns a [connection](#connections). It accepts the diff --git a/spec/graphql/resolvers/projects/jira_projects_resolver_spec.rb b/spec/graphql/resolvers/projects/jira_projects_resolver_spec.rb index b95bab41e3efd2243a2d72a3d87c5b214f2a943a..6af2f56cef47e2cdee80a958ee0a8af1d0f1728d 100644 --- a/spec/graphql/resolvers/projects/jira_projects_resolver_spec.rb +++ b/spec/graphql/resolvers/projects/jira_projects_resolver_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Resolvers::Projects::JiraProjectsResolver do +RSpec.describe Resolvers::Projects::JiraProjectsResolver, feature_category: :integrations do include GraphqlHelpers specify do diff --git a/spec/support/shared_examples/graphql/projects/services_resolver_shared_examples.rb b/spec/support/shared_examples/graphql/projects/services_resolver_shared_examples.rb index 16c2ab07f3aac9ea1a71ca53857a7f45703daff7..d9a9400cb4eda74b535fc6d826220ca4a87f2adb 100644 --- a/spec/support/shared_examples/graphql/projects/services_resolver_shared_examples.rb +++ b/spec/support/shared_examples/graphql/projects/services_resolver_shared_examples.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true - +# TODO: Remove in 17.0, see https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108418 RSpec.shared_examples 'no project services' do it 'returns empty collection' do expect(resolve_services).to be_empty