gitlab
/
omnibus-gitlab
mirror of https://gitlab.com/gitlab-org/omnibus-gitlab.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'builds_default' into 'master' 

Add gitlab_default_projects_features_builds variable

A new variable has been introduced in one of the latest versions. This sets the default value for projects concerning the new builds feature.

See merge request !552
This commit is contained in:
Marin Jankovski 2015-12-02 13:22:41 +00:00
parent bf71df7c68 c182503f41
commit e13556d337
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
files/gitlab-config-template/gitlab.rb.template
View File

@ -28,6 +28,7 @@ external_url 'GENERATED_EXTERNAL_URL'
# gitlab_rails['gitlab_default_projects_features_wiki'] = true
# gitlab_rails['gitlab_default_projects_features_snippets'] = false
# gitlab_rails['gitlab_default_projects_features_visibility_level'] = 'private'
# gitlab_rails['gitlab_default_projects_features_builds'] = true
# gitlab_rails['gitlab_repository_downloads_path'] = 'tmp/repositories'
# gitlab_rails['gravatar_plain_url'] = 'http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon'
# gitlab_rails['gravatar_ssl_url'] = 'https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon'

1
files/gitlab-cookbooks/gitlab/attributes/default.rb
View File

@ -82,6 +82,7 @@ default['gitlab']['gitlab-rails']['gitlab_default_projects_features_wiki'] = nil
default['gitlab']['gitlab-rails']['gitlab_default_projects_features_wall'] = nil
default['gitlab']['gitlab-rails']['gitlab_default_projects_features_snippets'] = nil
default['gitlab']['gitlab-rails']['gitlab_default_projects_features_visibility_level'] = nil
default['gitlab']['gitlab-rails']['gitlab_default_projects_features_builds'] = nil
default['gitlab']['gitlab-rails']['gitlab_issue_closing_pattern'] = nil
default['gitlab']['gitlab-rails']['gitlab_repository_downloads_path'] = nil
default['gitlab']['gitlab-rails']['gravatar_plain_url'] = nil

1
files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
View File

@ -68,6 +68,7 @@ production: &base
wiki: <%= @gitlab_default_projects_features_wiki %>
snippets: <%= @gitlab_default_projects_features_snippets %>
visibility_level: <%= single_quote(@gitlab_default_projects_features_visibility_level) %> # can be "private" | "internal" | "public"
builds: <%= @gitlab_default_projects_features_builds %>
## Webhook settings
# Number of seconds to wait for HTTP response after sending webhook HTTP POST request (default: 10)