diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2018-01-23 12:24:16 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-01-29 12:57:56 -0600 |
| commit | fc37de8cc2697cea41032794119a9f8622d41fd4 (patch) | |
| tree | 9080c70bdfd934eb7a8685f63e2c26dc9e09db10 | |
| parent | a655f1d9a39bd4d21af8dd1ce2276e24caa09dc6 (diff) | |
| download | gitlab-ce-10-4-stable-patch-2.tar.gz | |
Merge branch '42022-allow-users-to-request-access-not-visible-when-project-visibility-is-public' into 'master'10-4-stable-patch-2
Fix visibility of "Allow users to request access" option in public projects
See merge request gitlab-org/gitlab-ce!16485
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/projects/permissions/components/settings_panel.vue b/app/assets/javascripts/projects/permissions/components/settings_panel.vue index 639429baf26..ddf05d9fd66 100644 --- a/app/assets/javascripts/projects/permissions/components/settings_panel.vue +++ b/app/assets/javascripts/projects/permissions/components/settings_panel.vue @@ -207,7 +207,7 @@ export default { </div> </div> <span class="help-block">{{ visibilityLevelDescription }}</span> - <label v-if="visibilityLevel !== visibilityOptions.PUBLIC" class="request-access"> + <label v-if="visibilityLevel !== visibilityOptions.PRIVATE" class="request-access"> <input type="hidden" name="project[request_access_enabled]" diff --git a/changelogs/unreleased/42022-allow-users-to-request-access-not-visible-when-project-visibility-is-public.yml b/changelogs/unreleased/42022-allow-users-to-request-access-not-visible-when-project-visibility-is-public.yml new file mode 100644 index 00000000000..38684cd3c44 --- /dev/null +++ b/changelogs/unreleased/42022-allow-users-to-request-access-not-visible-when-project-visibility-is-public.yml @@ -0,0 +1,5 @@ +--- +title: Fix missing "allow users to request access" option in public project permissions +merge_request: 16485 +author: +type: fixed |