Add latest changes from gitlab-org/gitlab@master

4 files changed, 4 insertions, 22 deletions

diff --git a/app/assets/javascripts/packages_and_registries/dependency_proxy/app.vue b/app/assets/javascripts/packages_and_registries/dependency_proxy/app.vue
index 6c64fd4ccb1..1faff1ff4de 100644
--- a/app/assets/javascripts/packages_and_registries/dependency_proxy/app.vue
+++ b/app/assets/javascripts/packages_and_registries/dependency_proxy/app.vue
@@ -39,11 +39,8 @@ export default {
   directives: {
     GlModalDirective,
   },
-  inject: ['groupPath', 'groupId', 'dependencyProxyAvailable', 'noManifestsIllustration'],
+  inject: ['groupPath', 'groupId', 'noManifestsIllustration'],
   i18n: {
-    proxyNotAvailableText: s__(
-      'DependencyProxy|Dependency Proxy feature is limited to public groups for now.',
-    ),
     proxyImagePrefix: s__('DependencyProxy|Dependency Proxy image prefix'),
     copyImagePrefixText: s__('DependencyProxy|Copy prefix'),
     blobCountAndSize: s__('DependencyProxy|Contains %{count} blobs of images (%{size})'),
@@ -77,9 +74,6 @@ export default {
   apollo: {
     group: {
       query: getDependencyProxyDetailsQuery,
-      skip() {
-        return !this.dependencyProxyAvailable;
-      },
       variables() {
         return this.queryVariables;
       },
@@ -214,15 +208,7 @@ export default {
       </template>
     </gl-form-group>
 
-    <gl-alert
-      v-if="!dependencyProxyAvailable"
-      :dismissible="false"
-      data-testid="proxy-not-available"
-    >
-      {{ $options.i18n.proxyNotAvailableText }}
-    </gl-alert>
-
-    <gl-skeleton-loader v-else-if="$apollo.queries.group.loading" />
+    <gl-skeleton-loader v-if="$apollo.queries.group.loading" />
 
     <div v-else data-testid="main-area">
       <manifests-list
diff --git a/app/assets/javascripts/packages_and_registries/dependency_proxy/index.js b/app/assets/javascripts/packages_and_registries/dependency_proxy/index.js
index dc73470e07d..14789aafdb7 100644
--- a/app/assets/javascripts/packages_and_registries/dependency_proxy/index.js
+++ b/app/assets/javascripts/packages_and_registries/dependency_proxy/index.js
@@ -1,5 +1,4 @@
 import Vue from 'vue';
-import { parseBoolean } from '~/lib/utils/common_utils';
 import app from '~/packages_and_registries/dependency_proxy/app.vue';
 import { apolloProvider } from '~/packages_and_registries/dependency_proxy/graphql';
 import Translate from '~/vue_shared/translate';
@@ -11,12 +10,11 @@ export const initDependencyProxyApp = () => {
   if (!el) {
     return null;
   }
-  const { dependencyProxyAvailable, ...dataset } = el.dataset;
+  const { ...dataset } = el.dataset;
   return new Vue({
     el,
     apolloProvider,
     provide: {
-      dependencyProxyAvailable: parseBoolean(dependencyProxyAvailable),
       ...dataset,
     },
     render(createElement) {
diff --git a/app/assets/javascripts/packages_and_registries/settings/group/bundle.js b/app/assets/javascripts/packages_and_registries/settings/group/bundle.js
index 85a7aeb5561..482a3ef2ead 100644
--- a/app/assets/javascripts/packages_and_registries/settings/group/bundle.js
+++ b/app/assets/javascripts/packages_and_registries/settings/group/bundle.js
@@ -21,7 +21,6 @@ export default () => {
       groupPath: el.dataset.groupPath,
       groupDependencyProxyPath: el.dataset.groupDependencyProxyPath,
       defaultExpanded: parseBoolean(el.dataset.defaultExpanded),
-      dependencyProxyAvailable: parseBoolean(el.dataset.dependencyProxyAvailable),
     },
     render(createElement) {
       return createElement(SettingsApp);
diff --git a/app/assets/javascripts/packages_and_registries/settings/group/components/group_settings_app.vue b/app/assets/javascripts/packages_and_registries/settings/group/components/group_settings_app.vue
index 64c12b4be6a..f285dfc0755 100644
--- a/app/assets/javascripts/packages_and_registries/settings/group/components/group_settings_app.vue
+++ b/app/assets/javascripts/packages_and_registries/settings/group/components/group_settings_app.vue
@@ -13,7 +13,7 @@ export default {
     PackagesSettings,
     DependencyProxySettings,
   },
-  inject: ['groupPath', 'dependencyProxyAvailable'],
+  inject: ['groupPath'],
   apollo: {
     group: {
       query: getGroupPackagesSettingsQuery,
@@ -83,7 +83,6 @@ export default {
     />
 
     <dependency-proxy-settings
-      v-if="dependencyProxyAvailable"
       :dependency-proxy-settings="dependencyProxySettings"
       :dependency-proxy-image-ttl-policy="dependencyProxyImageTtlPolicy"
       :is-loading="isLoading"