Download as
Browse Code »

Commit eba6eb300e2deada94e87990fbe3a112199be8e9

Authored by Jacob Vosmaer
2 parents e5745902 774afc36
Exists in master and in 8 other branches 7-0-stable, 7-0-stable-ee, 7-0-stable-spb, 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee, branch_test

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
  Diff comments   View file @eba6eb3
@@ -54,7 +54,6 @@ default['gitlab']['gitlab-rails']['gitlab_host'] = node['fqdn'] @@ -54,7 +54,6 @@ default['gitlab']['gitlab-rails']['gitlab_host'] = node['fqdn']
54 default['gitlab']['gitlab-rails']['gitlab_port'] = 80 54 default['gitlab']['gitlab-rails']['gitlab_port'] = 80
55 default['gitlab']['gitlab-rails']['gitlab_https'] = false 55 default['gitlab']['gitlab-rails']['gitlab_https'] = false
56 default['gitlab']['gitlab-rails']['gitlab_email_from'] = "gitlab@#{node['fqdn']}" 56 default['gitlab']['gitlab-rails']['gitlab_email_from'] = "gitlab@#{node['fqdn']}"
57 -default['gitlab']['gitlab-rails']['gitlab_support_email'] = "support@localhost"  
58 default['gitlab']['gitlab-rails']['gitlab_default_projects_limit'] = 10 57 default['gitlab']['gitlab-rails']['gitlab_default_projects_limit'] = 10
59 default['gitlab']['gitlab-rails']['gitlab_default_can_create_group'] = nil 58 default['gitlab']['gitlab-rails']['gitlab_default_can_create_group'] = nil
60 default['gitlab']['gitlab-rails']['gitlab_username_changing_enabled'] = nil 59 default['gitlab']['gitlab-rails']['gitlab_username_changing_enabled'] = nil
files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
  Diff comments   View file @eba6eb3
@@ -30,8 +30,7 @@ production: &base @@ -30,8 +30,7 @@ production: &base
30 # Email address used in the "From" field in mails sent by GitLab 30 # Email address used in the "From" field in mails sent by GitLab
31 email_from: <%= @gitlab_email_from %> 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 ## User settings 35 ## User settings
37 default_projects_limit: <%= @gitlab_default_projects_limit %> 36 default_projects_limit: <%= @gitlab_default_projects_limit %>
@@ -69,7 +68,6 @@ production: &amp;base @@ -69,7 +68,6 @@ production: &amp;base
69 issues: <%= @gitlab_default_projects_features_issues %> 68 issues: <%= @gitlab_default_projects_features_issues %>
70 merge_requests: <%= @gitlab_default_projects_features_merge_requests %> 69 merge_requests: <%= @gitlab_default_projects_features_merge_requests %>
71 wiki: <%= @gitlab_default_projects_features_wiki %> 70 wiki: <%= @gitlab_default_projects_features_wiki %>
72 - wall: <%= @gitlab_default_projects_features_wall %>  
73 snippets: <%= @gitlab_default_projects_features_snippets %> 71 snippets: <%= @gitlab_default_projects_features_snippets %>
74 visibility_level: "<%= @gitlab_default_projects_features_visibility_level %>" # can be "private" | "internal" | "public" 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
  Diff comments   View file @eba6eb3
@@ -77,6 +77,7 @@ server { @@ -77,6 +77,7 @@ server {
77 proxy_set_header Host $http_host; 77 proxy_set_header Host $http_host;
78 proxy_set_header X-Real-IP $remote_addr; 78 proxy_set_header X-Real-IP $remote_addr;
79 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; 79 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
  80 + proxy_set_header X-Frame-Options SAMEORIGIN;
80 81
81 proxy_pass http://gitlab; 82 proxy_pass http://gitlab;
82 } 83 }