Automatic merge of gitlab-org/gitlab-ce master

app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue

@@ -144,6 +144,10 @@ export default {
     visibilityLevelDescription() {
       return visibilityLevelDescriptions[this.visibilityLevel];
     },
+
+    showContainerRegistryPublicNote() {
+      return this.visibilityLevel === visibilityOptions.PUBLIC;
+    },
   },
 
   watch: {
@@ -286,6 +290,9 @@ export default {
           label="Container registry"
           help-text="Every project can have its own space to store its Docker images"
         >
+          <div v-if="showContainerRegistryPublicNote" class="text-muted">
+            {{ __('Note: the container registry is always visible when a project is public') }}
+          </div>
           <project-feature-toggle
             v-model="containerRegistryEnabled"
             :disabled-input="!repositoryEnabled"

changelogs/unreleased/add-warning-note-to-project-container-registry-setting.yml

+---
+title: Added warning note on the project container registry setting informing users
+  that the registry is public for public projects
+merge_request: 32447
+author:
+type: other