Add latest changes from gitlab-org/gitlab@master

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