Download as
Browse Code »

Commit 0620670f8bf5fd6e168cf424e4336618bce25c30

Authored by Jacob Vosmaer
2 parents 1f63333e bebac152
Exists in master and in 2 other branches 7-2-stable, 7-2-stable-ee

Merge branch 'update_templates' into 'master' 

Update templates

In preparation for 7.2 release

See merge request !188
Showing 1 changed file with 17 additions and 4 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
  Diff comments   View file @0620670
... ... @@ -48,7 +48,7 @@ production: &base
48 48 # This also allows normal users to sign up for accounts themselves
49 49 # default: false - By default GitLab administrators must create all new accounts
50 50 signup_enabled: <%= @gitlab_signup_enabled %>
51   - #
  51 +
52 52 ## Standard login settings
53 53 # The standard login can be disabled to force login via LDAP
54 54 # default: true - If set to false the standard login form won't be shown on the sign-in page
... ... @@ -62,6 +62,7 @@ production: &amp;base
62 62 # If a commit message matches this regular expression, all issues referenced from the matched text will be closed.
63 63 # This happens when the commit is pushed or merged into the default branch of a project.
64 64 # When not specified the default issue_closing_pattern as specified below will be used.
  65 + # Tip: you can test your closing pattern at http://rubular.com
65 66 # issue_closing_pattern: '([Cc]lose[sd]|[Ff]ixe[sd]) +#\d+'
66 67  
67 68 ## Default project features settings
... ... @@ -114,8 +115,8 @@ production: &amp;base
114 115 gravatar:
115 116 enabled: <%= @gravatar_enabled %> # Use user avatar image from Gravatar.com (default: true)
116 117 # gravatar urls: possible placeholders: %{hash} %{size} %{email}
117   - plain_url: <%= single_quote(@gravatar_plain_url) %> # default: http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=mm
118   - ssl_url: <%= single_quote(@gravatar_ssl_url) %> # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=mm
  118 + plain_url: <%= single_quote(@gravatar_plain_url) %> # default: http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon
  119 + ssl_url: <%= single_quote(@gravatar_ssl_url) %> # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon
119 120  
120 121 #
121 122 # 2. Auth settings
... ... @@ -190,7 +191,7 @@ production: &amp;base
190 191 ## Auth providers
191 192 # Uncomment the following lines and fill in the data of the auth provider you want to use
192 193 # If your favorite auth provider is not listed you can use others:
193   - # see https://github.com/gitlabhq/gitlab-public-wiki/wiki/Working-custom-omniauth-provider-configurations
  194 + # see https://github.com/gitlabhq/gitlab-public-wiki/wiki/Custom-omniauth-provider-configurations
194 195 # The 'app_id' and 'app_secret' parameters are always passed as the first two
195 196 # arguments, followed by optional 'args' which can be either a hash or an array.
196 197 # Documentation for this is available at http://doc.gitlab.com/ce/integration/omniauth.html
... ... @@ -217,6 +218,7 @@ production: &amp;base
217 218 satellites:
218 219 # Relative paths are relative to Rails.root (default: tmp/repo_satellites/)
219 220 path: <%= @satellites_path %>
  221 + timeout: 30
220 222  
221 223 ## Backup settings
222 224 backup:
... ... @@ -284,6 +286,17 @@ test:
284 286 gitlab:
285 287 host: localhost
286 288 port: 80
  289 +
  290 + # When you run tests we clone and setup gitlab-shell
  291 + # In order to setup it correctly you need to specify
  292 + # your system username you use to run GitLab
  293 + # user: YOUR_USERNAME
  294 + satellites:
  295 + path: tmp/tests/gitlab-satellites/
  296 + gitlab_shell:
  297 + path: tmp/tests/gitlab-shell/
  298 + repos_path: tmp/tests/repositories/
  299 + hooks_path: tmp/tests/gitlab-shell/hooks/
287 300 issues_tracker:
288 301 redmine:
289 302 title: "Redmine"
... ...