diff --git a/CHANGELOG b/CHANGELOG index 6d19832..d2cabb3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,8 @@ The latest version of this file can be found at the master branch of the omnibus-gitlab repository. +- Support changing the 'restricted_visibility_levels' option (Javier Palomo) + 7.1.0 - Build: explicitly use .forward for sending notifications - Fix MySQL build for Ubuntu 14.04 diff --git a/files/gitlab-cookbooks/gitlab/attributes/default.rb b/files/gitlab-cookbooks/gitlab/attributes/default.rb index 39c6fa6..ab1f63f 100644 --- a/files/gitlab-cookbooks/gitlab/attributes/default.rb +++ b/files/gitlab-cookbooks/gitlab/attributes/default.rb @@ -60,6 +60,7 @@ default['gitlab']['gitlab-rails']['gitlab_username_changing_enabled'] = nil default['gitlab']['gitlab-rails']['gitlab_default_theme'] = nil default['gitlab']['gitlab-rails']['gitlab_signup_enabled'] = nil default['gitlab']['gitlab-rails']['gitlab_signin_enabled'] = nil +default['gitlab']['gitlab-rails']['gitlab_restricted_visibility_levels'] = [] default['gitlab']['gitlab-rails']['gitlab_default_projects_features_issues'] = true default['gitlab']['gitlab-rails']['gitlab_default_projects_features_merge_requests'] = true default['gitlab']['gitlab-rails']['gitlab_default_projects_features_wiki'] = true diff --git a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb index 89a5d57..eec05d5 100644 --- a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb +++ b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb @@ -55,7 +55,7 @@ production: &base # Restrict setting visibility levels for non-admin users. # The default is to allow all levels. - #restricted_visibility_levels: [ "public" ] + restricted_visibility_levels: <%= @gitlab_restricted_visibility_levels %> ## Automatic issue closing # If a commit message matches this regular expression, all issues referenced from the matched text will be closed. -- libgit2 0.21.2