diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-05-27 15:17:06 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-05-27 15:17:06 +0300 |
| commit | ec1055076c400a579d87fe970da342617efd4f94 (patch) | |
| tree | bb331e0a8d725156541fe9f33225d1db5947268e /config/gitlab.yml.example | |
| parent | 01d8c7d6dd27410c41447c867e96d6587f17572f (diff) | |
| parent | 22279bc55870435c61d5e8208cc3117ef2268052 (diff) | |
| download | gitlab-ce-ec1055076c400a579d87fe970da342617efd4f94.tar.gz | |
Merge branch 'add-defaults-create-group-team' of https://github.com/dmedvinsky/gitlabhq into dmedvinsky-add-defaults-create-group-team
Conflicts:
config/gitlab.yml.example
Diffstat (limited to 'config/gitlab.yml.example')
| -rw-r--r-- | config/gitlab.yml.example | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 413560159d5..e5fac336a44 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -32,12 +32,14 @@ production: &base # Email address of your support contact (default: same as email_from) support_email: support@localhost - ## Project settings + ## User settings default_projects_limit: 10 + # default_can_create_group: false # default: true + # default_can_create_team: false # default: true + # username_changing_enabled: false # default: true - User can change her username/namespace ## Users management # signup_enabled: true # default: false - Account passwords are not sent via the email if signup is enabled. - # username_changing_enabled: false # default: true - User can change her username/namespace ## Default project features settings default_projects_features: |