diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-01 18:09:29 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-01 18:09:29 +0000 |
commit | 3011f8b297a5b71cd505a672b59cc8d3e0aa9f65 (patch) | |
tree | 99bf3a2d875f92f7d77a8302911b1ff3ce2a19be /app/graphql/resolvers | |
parent | 06f736847bb6a7f577a8f121f94e4cc7ddb51856 (diff) | |
download | gitlab-ce-3011f8b297a5b71cd505a672b59cc8d3e0aa9f65.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/graphql/resolvers')
-rw-r--r-- | app/graphql/resolvers/clusters/agent_tokens_resolver.rb | 8 | ||||
-rw-r--r-- | app/graphql/resolvers/clusters/agents_resolver.rb | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/app/graphql/resolvers/clusters/agent_tokens_resolver.rb b/app/graphql/resolvers/clusters/agent_tokens_resolver.rb index b7355a1752e..0b9422db2a9 100644 --- a/app/graphql/resolvers/clusters/agent_tokens_resolver.rb +++ b/app/graphql/resolvers/clusters/agent_tokens_resolver.rb @@ -9,12 +9,8 @@ module Resolvers delegate :project, to: :agent - argument :status, Types::Clusters::AgentTokenStatusEnum, - required: false, - description: 'Status of the token.' - - def resolve(**args) - ::Clusters::AgentTokensFinder.new(agent, current_user, args).execute + def resolve(**_args) + ::Clusters::AgentTokensFinder.new(agent, current_user, status: :active).execute end end end diff --git a/app/graphql/resolvers/clusters/agents_resolver.rb b/app/graphql/resolvers/clusters/agents_resolver.rb index 0b9eb361dbd..f138ad2b510 100644 --- a/app/graphql/resolvers/clusters/agents_resolver.rb +++ b/app/graphql/resolvers/clusters/agents_resolver.rb @@ -28,7 +28,7 @@ module Resolvers def preloads { activity_events: { activity_events: [:user, agent_token: :agent] }, - tokens: :agent_tokens + tokens: :active_agent_tokens } end end |