Add latest changes from gitlab-org/gitlab@master

4 files changed, 6 insertions, 6 deletions

diff --git a/app/assets/javascripts/runner/admin_runners/admin_runners_app.vue b/app/assets/javascripts/runner/admin_runners/admin_runners_app.vue
index 477ce96c4b1..f6b7a8b46d7 100644
--- a/app/assets/javascripts/runner/admin_runners/admin_runners_app.vue
+++ b/app/assets/javascripts/runner/admin_runners/admin_runners_app.vue
@@ -11,7 +11,7 @@ import {
   fromSearchToVariables,
   isSearchFiltered,
 } from 'ee_else_ce/runner/runner_search_utils';
-import runnersAdminQuery from 'ee_else_ce/runner/graphql/list/admin_runners.query.graphql';
+import allRunnersQuery from 'ee_else_ce/runner/graphql/list/all_runners.query.graphql';
 
 import RegistrationDropdown from '../components/registration/registration_dropdown.vue';
 import RunnerFilteredSearchBar from '../components/runner_filtered_search_bar.vue';
@@ -64,7 +64,7 @@ export default {
   },
   apollo: {
     runners: {
-      query: runnersAdminQuery,
+      query: allRunnersQuery,
       fetchPolicy: fetchPolicies.NETWORK_ONLY,
       variables() {
         return this.variables;
diff --git a/app/assets/javascripts/runner/components/stat/runner_count.vue b/app/assets/javascripts/runner/components/stat/runner_count.vue
index c56d6e1d478..af18b203f90 100644
--- a/app/assets/javascripts/runner/components/stat/runner_count.vue
+++ b/app/assets/javascripts/runner/components/stat/runner_count.vue
@@ -1,7 +1,7 @@
 <script>
 import { fetchPolicies } from '~/lib/graphql';
 import { captureException } from '../../sentry_utils';
-import runnersAdminCountQuery from '../../graphql/list/admin_runners_count.query.graphql';
+import allRunnersCountQuery from '../../graphql/list/all_runners_count.query.graphql';
 import groupRunnersCountQuery from '../../graphql/list/group_runners_count.query.graphql';
 import { INSTANCE_TYPE, GROUP_TYPE } from '../../constants';
 
@@ -53,7 +53,7 @@ export default {
     count: {
       query() {
         if (this.scope === INSTANCE_TYPE) {
-          return runnersAdminCountQuery;
+          return allRunnersCountQuery;
         } else if (this.scope === GROUP_TYPE) {
           return groupRunnersCountQuery;
         }
diff --git a/app/assets/javascripts/runner/graphql/list/admin_runners.query.graphql b/app/assets/javascripts/runner/graphql/list/all_runners.query.graphql
index 61bfe03bf6e..6bb896dda16 100644
--- a/app/assets/javascripts/runner/graphql/list/admin_runners.query.graphql
+++ b/app/assets/javascripts/runner/graphql/list/all_runners.query.graphql
@@ -1,7 +1,7 @@
 #import "ee_else_ce/runner/graphql/list/list_item.fragment.graphql"
 #import "~/graphql_shared/fragments/page_info.fragment.graphql"
 
-query getRunners(
+query getAllRunners(
   $before: String
   $after: String
   $first: Int
diff --git a/app/assets/javascripts/runner/graphql/list/admin_runners_count.query.graphql b/app/assets/javascripts/runner/graphql/list/all_runners_count.query.graphql
index 1dd258a3524..82591b88d3e 100644
--- a/app/assets/javascripts/runner/graphql/list/admin_runners_count.query.graphql
+++ b/app/assets/javascripts/runner/graphql/list/all_runners_count.query.graphql
@@ -1,4 +1,4 @@
-query getRunnersCount(
+query getAllRunnersCount(
   $paused: Boolean
   $status: CiRunnerStatus
   $type: CiRunnerType