Download as
Browse Code »

Commit 18679b2a6b84198cdbd7d510715cf177618963af

Authored by Javier Palomo Almena
1 parent a7806e6b
Exists in master and in 4 other branches 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee

Avoid hard-coding upstream gitlab-rails defaults. 

As suggested by jacobvosmaer, see:
https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/162/diffs#note_159900
Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/attributes/default.rb
  Diff comments   View file @18679b2
@@ -60,7 +60,7 @@ default['gitlab']['gitlab-rails']['gitlab_username_changing_enabled'] = nil @@ -60,7 +60,7 @@ default['gitlab']['gitlab-rails']['gitlab_username_changing_enabled'] = nil
60 default['gitlab']['gitlab-rails']['gitlab_default_theme'] = nil 60 default['gitlab']['gitlab-rails']['gitlab_default_theme'] = nil
61 default['gitlab']['gitlab-rails']['gitlab_signup_enabled'] = nil 61 default['gitlab']['gitlab-rails']['gitlab_signup_enabled'] = nil
62 default['gitlab']['gitlab-rails']['gitlab_signin_enabled'] = nil 62 default['gitlab']['gitlab-rails']['gitlab_signin_enabled'] = nil
63 -default['gitlab']['gitlab-rails']['gitlab_restricted_visibility_levels'] = [] 63 +default['gitlab']['gitlab-rails']['gitlab_restricted_visibility_levels'] = nil
64 default['gitlab']['gitlab-rails']['gitlab_default_projects_features_issues'] = true 64 default['gitlab']['gitlab-rails']['gitlab_default_projects_features_issues'] = true
65 default['gitlab']['gitlab-rails']['gitlab_default_projects_features_merge_requests'] = true 65 default['gitlab']['gitlab-rails']['gitlab_default_projects_features_merge_requests'] = true
66 default['gitlab']['gitlab-rails']['gitlab_default_projects_features_wiki'] = true 66 default['gitlab']['gitlab-rails']['gitlab_default_projects_features_wiki'] = true
files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
  Diff comments   View file @18679b2
@@ -55,7 +55,7 @@ production: &base @@ -55,7 +55,7 @@ production: &base
55 55
56 # Restrict setting visibility levels for non-admin users. 56 # Restrict setting visibility levels for non-admin users.
57 # The default is to allow all levels. 57 # The default is to allow all levels.
58 - restricted_visibility_levels: <%= @gitlab_restricted_visibility_levels %> 58 + restricted_visibility_levels: <%= @gitlab_restricted_visibility_levels unless @gitlab_restricted_visibility_levels.nil? %>
59 59
60 ## Automatic issue closing 60 ## Automatic issue closing
61 # If a commit message matches this regular expression, all issues referenced from the matched text will be closed. 61 # If a commit message matches this regular expression, all issues referenced from the matched text will be closed.