Download as
Browse Code »

Commit 5a80a28a1854db0980f6846ff6bb0e3b7815ad1d

Authored by Dmitriy Zaporozhets
2 parents 891dc550 1c8c5c76
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #3123 from wtw/patch-1 

Corrected some typos in gitlab.yml.example comments
Showing 1 changed file with 16 additions and 17 deletions   Show diff stats
config/gitlab.yml.example
  Diff comments   View file @5a80a28
1 1 # # # # # # # # # # # # # # # # # #
2   -# Gitlab application config file #
  2 +# GitLab application config file #
3 3 # # # # # # # # # # # # # # # # # #
4 4 #
5 5 # How to use:
... ... @@ -41,21 +41,21 @@ production: &base
41 41 ## External issues trackers
42 42 issues_tracker:
43 43 redmine:
44   - ## If not nil, link 'Issues' on project page will be replaced tp this
  44 + ## If not nil, link 'Issues' on project page will be replaced with this
45 45 ## Use placeholders:
46   - ## :project_id - Gitlab project identifier
  46 + ## :project_id - GitLab project identifier
47 47 ## :issues_tracker_id - Project Name or Id in external issue tracker
48 48 project_url: "http://redmine.sample/projects/:issues_tracker_id"
49   - ## If not nil, links from /#\d/ entities from commit messages will replaced to this
  49 + ## If not nil, links from /#\d/ entities from commit messages will replaced with this
50 50 ## Use placeholders:
51   - ## :project_id - Gitlab project identifier
  51 + ## :project_id - GitLab project identifier
52 52 ## :issues_tracker_id - Project Name or Id in external issue tracker
53 53 ## :id - Issue id (from commit messages)
54 54 issues_url: "http://redmine.sample/issues/:id"
55 55  
56 56 ## Gravatar
57 57 gravatar:
58   - enabled: true # Use user avatar images from Gravatar.com (default: true)
  58 + enabled: true # Use user avatar image from Gravatar.com (default: true)
59 59 # plain_url: "http://..." # default: http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=mm
60 60 # ssl_url: "https://..." # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=mm
61 61  
... ... @@ -76,22 +76,21 @@ production: &base
76 76 bind_dn: '_the_full_dn_of_the_user_you_will_bind_with'
77 77 password: '_the_password_of_the_bind_user'
78 78  
79   - ## Omniauth settings
  79 + ## OmniAuth settings
80 80 omniauth:
81   - # Enable ability for users
82   - # Allow logging in via Twitter, Google, etc. using Omniauth providers
  81 + # Allow login via Twitter, Google, etc. using OmniAuth providers
83 82 enabled: false
84 83  
85 84 # CAUTION!
86   - # This allows users to login without having a user account first (default: false)
  85 + # This allows users to login without having a user account first (default: false).
87 86 # User accounts will be created automatically when authentication was successful.
88 87 allow_single_sign_on: false
89   - # Locks down those users until they have been cleared by the admin (default: true)
  88 + # Locks down those users until they have been cleared by the admin (default: true).
90 89 block_auto_created_users: true
91 90  
92 91 ## Auth providers
93   - # Uncomment the lines and fill in the data of the auth provider you want to use
94   - # If your favorite auth provider is not listed you can user others:
  92 + # Uncomment the following lines and fill in the data of the auth provider you want to use
  93 + # If your favorite auth provider is not listed you can use others:
95 94 # see https://github.com/gitlabhq/gitlabhq/wiki/Using-Custom-Omniauth-Providers
96 95 # The 'app_id' and 'app_secret' parameters are always passed as the first two
97 96 # arguments, followed by optional 'args' which can be either a hash or an array.
... ... @@ -130,7 +129,7 @@ production: &base
130 129 upload_pack: true
131 130 receive_pack: true
132 131  
133   - # If you use non-standart ssh port you need to specify it
  132 + # If you use non-standard ssh port you need to specify it
134 133 # ssh_port: 22
135 134  
136 135 ## Git settings
... ... @@ -138,10 +137,10 @@ production: &base
138 137 # Use the default values unless you really know what you are doing
139 138 git:
140 139 bin_path: /usr/bin/git
141   - # Max size of git object like commit, in bytes
142   - # This value can be increased if you have a very large commits
  140 + # Max size of a git object (e.g. a commit), in bytes
  141 + # This value can be increased if you have very large commits
143 142 max_size: 5242880 # 5.megabytes
144   - # Git timeout to read commit, in seconds
  143 + # Git timeout to read a commit, in seconds
145 144 timeout: 10
146 145  
147 146 development:
... ...