Commit eba6eb300e2deada94e87990fbe3a112199be8e9
Exists in
master
and in
8 other branches
Merge branch 'update_templates_7.0' into 'master'
Update templates for GitLab 7.0
Showing
3 changed files
with
2 additions
and
4 deletions
Show diff stats
files/gitlab-cookbooks/gitlab/attributes/default.rb
... | ... | @@ -54,7 +54,6 @@ default['gitlab']['gitlab-rails']['gitlab_host'] = node['fqdn'] |
54 | 54 | default['gitlab']['gitlab-rails']['gitlab_port'] = 80 |
55 | 55 | default['gitlab']['gitlab-rails']['gitlab_https'] = false |
56 | 56 | default['gitlab']['gitlab-rails']['gitlab_email_from'] = "gitlab@#{node['fqdn']}" |
57 | -default['gitlab']['gitlab-rails']['gitlab_support_email'] = "support@localhost" | |
58 | 57 | default['gitlab']['gitlab-rails']['gitlab_default_projects_limit'] = 10 |
59 | 58 | default['gitlab']['gitlab-rails']['gitlab_default_can_create_group'] = nil |
60 | 59 | default['gitlab']['gitlab-rails']['gitlab_username_changing_enabled'] = nil | ... | ... |
files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
... | ... | @@ -30,8 +30,7 @@ production: &base |
30 | 30 | # Email address used in the "From" field in mails sent by GitLab |
31 | 31 | email_from: <%= @gitlab_email_from %> |
32 | 32 | |
33 | - # Email address of your support contact (default: same as email_from) | |
34 | - support_email: <%= @gitlab_support_email %> | |
33 | + # Email server smtp settings are in [a separate file](initializers/smtp_settings.rb.sample). | |
35 | 34 | |
36 | 35 | ## User settings |
37 | 36 | default_projects_limit: <%= @gitlab_default_projects_limit %> |
... | ... | @@ -69,7 +68,6 @@ production: &base |
69 | 68 | issues: <%= @gitlab_default_projects_features_issues %> |
70 | 69 | merge_requests: <%= @gitlab_default_projects_features_merge_requests %> |
71 | 70 | wiki: <%= @gitlab_default_projects_features_wiki %> |
72 | - wall: <%= @gitlab_default_projects_features_wall %> | |
73 | 71 | snippets: <%= @gitlab_default_projects_features_snippets %> |
74 | 72 | visibility_level: "<%= @gitlab_default_projects_features_visibility_level %>" # can be "private" | "internal" | "public" |
75 | 73 | ... | ... |
files/gitlab-cookbooks/gitlab/templates/default/nginx-gitlab-http.conf.erb