diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-02 05:25:57 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-02 05:25:57 +0000 |
| commit | 303029ccd0d1123db3a1eba8eda918b1d1cd2ac6 (patch) | |
| tree | 04c42197f4b957920e9fd6d26dbbb514adfe9e37 | |
| parent | 3b701f504636a0fa97c0364751367dbf2f72f279 (diff) | |
| parent | cd8d008cb95ce2321b7cdb36433ff40375043ce9 (diff) | |
| download | gitlab-ce-303029ccd0d1123db3a1eba8eda918b1d1cd2ac6.tar.gz | |
Automatic merge of gitlab-org/gitlab-ce master
| -rw-r--r-- | app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue | 7 | ||||
| -rw-r--r-- | changelogs/unreleased/add-warning-note-to-project-container-registry-setting.yml | 6 |
2 files changed, 13 insertions, 0 deletions
diff --git a/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue b/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue index a223a8f5b08..ea867d30ce8 100644 --- a/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue +++ b/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" diff --git a/changelogs/unreleased/add-warning-note-to-project-container-registry-setting.yml b/changelogs/unreleased/add-warning-note-to-project-container-registry-setting.yml new file mode 100644 index 00000000000..0663788b680 --- /dev/null +++ b/changelogs/unreleased/add-warning-note-to-project-container-registry-setting.yml @@ -0,0 +1,6 @@ +--- +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 |