summaryrefslogtreecommitdiff
path: root/app/controllers/projects_controller.rb
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/controllers/projects_controller.rb
parent37eff29d5ce44899e34c7c2ac319b314f2f26d15 (diff)
downloadgitlab-ce-22a0d312ae82e7dda3073d5d1a5a766d7641738d.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects_controller.rb')
-rw-r--r--app/controllers/projects_controller.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 76acca3b3bc..bf05defbc2e 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -391,6 +391,7 @@ class ProjectsController < Projects::ApplicationController
project_feature_attributes: %i[
builds_access_level
issues_access_level
+ forking_access_level
merge_requests_access_level
repository_access_level
snippets_access_level