diff options
Diffstat (limited to 'app/graphql')
| -rw-r--r-- | app/graphql/resolvers/ml/find_models_resolver.rb | 2 | ||||
| -rw-r--r-- | app/graphql/resolvers/ml/model_detail_resolver.rb | 2 | ||||
| -rw-r--r-- | app/graphql/types/ci/pipeline_type.rb | 3 | ||||
| -rw-r--r-- | app/graphql/types/projects/service_type_enum.rb | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/app/graphql/resolvers/ml/find_models_resolver.rb b/app/graphql/resolvers/ml/find_models_resolver.rb index b9901100e22..3816b17f3a0 100644 --- a/app/graphql/resolvers/ml/find_models_resolver.rb +++ b/app/graphql/resolvers/ml/find_models_resolver.rb @@ -20,7 +20,7 @@ module Resolvers description: 'Ordering column. Default is desc.' def resolve(**args) - return unless current_user.can?(:read_model_registry, object) + return unless Ability.allowed?(current_user, :read_model_registry, object) find_params = { name: args[:name], diff --git a/app/graphql/resolvers/ml/model_detail_resolver.rb b/app/graphql/resolvers/ml/model_detail_resolver.rb index 01c025c1d8a..7a5fe7821ea 100644 --- a/app/graphql/resolvers/ml/model_detail_resolver.rb +++ b/app/graphql/resolvers/ml/model_detail_resolver.rb @@ -13,7 +13,7 @@ module Resolvers def resolve(id:) Gitlab::Graphql::Lazy.with_value(find_object(id: id)) do |ml_model| - ml_model if current_user.can?(:read_model_registry, ml_model&.project) + ml_model if Ability.allowed?(current_user, :read_model_registry, ml_model&.project) end end diff --git a/app/graphql/types/ci/pipeline_type.rb b/app/graphql/types/ci/pipeline_type.rb index 65244235e10..c84864dcb9f 100644 --- a/app/graphql/types/ci/pipeline_type.rb +++ b/app/graphql/types/ci/pipeline_type.rb @@ -31,7 +31,8 @@ module Types end field :before_sha, GraphQL::Types::String, null: true, - description: 'Base SHA of the source branch.' + description: 'Base SHA of the source branch.', + calls_gitaly: true field :complete, GraphQL::Types::Boolean, null: false, method: :complete?, description: 'Indicates if a pipeline is complete.' diff --git a/app/graphql/types/projects/service_type_enum.rb b/app/graphql/types/projects/service_type_enum.rb index fd88fa957e7..7a8863c7d67 100644 --- a/app/graphql/types/projects/service_type_enum.rb +++ b/app/graphql/types/projects/service_type_enum.rb @@ -17,7 +17,7 @@ module Types # This prepend must stay here because the dynamic block below depends on it. prepend_mod # rubocop: disable Cop/InjectEnterpriseEditionModule - ::Integration.available_integration_names(include_dev: false).each do |name| + ::Integration.available_integration_names(include_instance_specific: false, include_dev: false).each do |name| type = "#{name.camelize}Service" domain_value = Integration.integration_name_to_type(name) value type.underscore.upcase, value: domain_value, description: type_description(name, type) |