summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2018-01-23 12:24:16 +0000
committerFatih Acet <acetfatih@gmail.com>2018-01-23 12:24:16 +0000
commit9455ef6c2088d89eb8b629c0b4021565d0a576ff (patch)
tree334cb366499d83d43f6cd4c5ccf621d6652802d7
parent33e727de96c0bd4289fa9fb8ff2bea3e0f6a36fd (diff)
parent0b8a64ea1639575a5fd6736126b9b18a9ecd23eb (diff)
downloadgitlab-ce-9455ef6c2088d89eb8b629c0b4021565d0a576ff.tar.gz
Merge branch '42022-allow-users-to-request-access-not-visible-when-project-visibility-is-public' into 'master'
Fix visibility of "Allow users to request access" option in public projects Closes #42022 See merge request gitlab-org/gitlab-ce!16485
-rw-r--r--app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue2
-rw-r--r--changelogs/unreleased/42022-allow-users-to-request-access-not-visible-when-project-visibility-is-public.yml5
2 files changed, 6 insertions, 1 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 380c6c3ea7d..755a34b7348 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
@@ -215,7 +215,7 @@
</div>
<span class="help-block">{{ visibilityLevelDescription }}</span>
<label
- v-if="visibilityLevel !== visibilityOptions.PUBLIC"
+ v-if="visibilityLevel !== visibilityOptions.PRIVATE"
class="request-access"
>
<input
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