From e5fb310a820e25c24f9430a6afaeef3557020232 Mon Sep 17 00:00:00 2001 From: 3kami3 Date: Fri, 7 Aug 2015 00:39:50 +0900 Subject: [PATCH] The customizing setting is restored, and the default value is matched up-stream. --- assets/config/gitlabhq/gitlab.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/config/gitlabhq/gitlab.yml b/assets/config/gitlabhq/gitlab.yml index 4ce9deae..e63f9de4 100644 --- a/assets/config/gitlabhq/gitlab.yml +++ b/assets/config/gitlabhq/gitlab.yml @@ -60,8 +60,8 @@ production: &base # Email server smtp settings are in config/initializers/smtp_settings.rb.sample - # default_can_create_group: false # default: true - # username_changing_enabled: false # default: true - User can change her username/namespace + default_can_create_group: {{GITLAB_CREATE_GROUP}} # default: true + username_changing_enabled: {{GITLAB_USERNAME_CHANGE}} # default: true - User can change her username/namespace ## Default theme ID ## 1 - Graphite ## 2 - Charcoal