summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/pages
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-17 18:08:41 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-17 18:08:41 +0000
commit22a0d312ae82e7dda3073d5d1a5a766d7641738d (patch)
tree41a677a7212f24e2f29c2fbd5623430f92fb2b45 /app/assets/javascripts/pages
parent37eff29d5ce44899e34c7c2ac319b314f2f26d15 (diff)
downloadgitlab-ce-22a0d312ae82e7dda3073d5d1a5a766d7641738d.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/pages')
-rw-r--r--app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue14
1 files changed, 14 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 0883b89d75b..6994f83bce0 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
@@ -104,6 +104,7 @@ export default {
visibilityLevel: visibilityOptions.PUBLIC,
issuesAccessLevel: 20,
repositoryAccessLevel: 20,
+ forkingAccessLevel: 20,
mergeRequestsAccessLevel: 20,
buildsAccessLevel: 20,
wikiAccessLevel: 20,
@@ -301,6 +302,19 @@ export default {
/>
</project-setting-row>
<project-setting-row
+ :label="s__('ProjectSettings|Forks')"
+ :help-text="
+ s__('ProjectSettings|Allow users to make copies of your repository to a new project')
+ "
+ >
+ <project-feature-setting
+ v-model="forkingAccessLevel"
+ :options="featureAccessLevelOptions"
+ :disabled-input="!repositoryEnabled"
+ name="project[project_feature_attributes][forking_access_level]"
+ />
+ </project-setting-row>
+ <project-setting-row
:label="s__('ProjectSettings|Pipelines')"
:help-text="s__('ProjectSettings|Build, test, and deploy your changes')"
>