Add latest changes from gitlab-org/gitlab@master

2 files changed, 26 insertions, 0 deletions

diff --git a/app/assets/javascripts/packages_and_registries/container_registry/explorer/graphql/index.js b/app/assets/javascripts/packages_and_registries/container_registry/explorer/graphql/index.js
index 9694bfd4e77..9b062024d03 100644
--- a/app/assets/javascripts/packages_and_registries/container_registry/explorer/graphql/index.js
+++ b/app/assets/javascripts/packages_and_registries/container_registry/explorer/graphql/index.js
@@ -4,11 +4,29 @@ import createDefaultClient from '~/lib/graphql';
 
 Vue.use(VueApollo);
 
+export const mergeVariables = (existing, incoming) => {
+  if (!incoming) return existing;
+  if (!existing) return incoming;
+  return incoming;
+};
+
 export const apolloProvider = new VueApollo({
   defaultClient: createDefaultClient(
     {},
     {
       batchMax: 1,
+      cacheConfig: {
+        typePolicies: {
+          ContainerRepositoryDetails: {
+            fields: {
+              tags: {
+                keyArgs: ['id'],
+                merge: mergeVariables,
+              },
+            },
+          },
+        },
+      },
     },
   ),
 });
diff --git a/app/assets/javascripts/packages_and_registries/container_registry/explorer/pages/details.vue b/app/assets/javascripts/packages_and_registries/container_registry/explorer/pages/details.vue
index 8b66165a57a..b339c8c8371 100644
--- a/app/assets/javascripts/packages_and_registries/container_registry/explorer/pages/details.vue
+++ b/app/assets/javascripts/packages_and_registries/container_registry/explorer/pages/details.vue
@@ -31,6 +31,7 @@ import {
 import deleteContainerRepositoryTagsMutation from '../graphql/mutations/delete_container_repository_tags.mutation.graphql';
 import getContainerRepositoryDetailsQuery from '../graphql/queries/get_container_repository_details.query.graphql';
 import getContainerRepositoryTagsQuery from '../graphql/queries/get_container_repository_tags.query.graphql';
+import getContainerRepositoriesDetails from '../graphql/queries/get_container_repositories_details.query.graphql';
 
 const REPOSITORY_IMPORTING_ERROR_MESSAGE = 'repository importing';
 
@@ -145,6 +146,13 @@ export default {
               query: getContainerRepositoryTagsQuery,
               variables: { ...this.queryVariables, first: GRAPHQL_PAGE_SIZE },
             },
+            {
+              query: getContainerRepositoriesDetails,
+              variables: {
+                fullPath: this.config.isGroupPage ? this.config.groupPath : this.config.projectPath,
+                isGroupPage: this.config.isGroupPage,
+              },
+            },
           ],
         });