removed GITLAB_SIGNIN configuration option, can be set from gitlab ui

This commit is contained in:
Sameer Naik 2015-02-07 12:45:23 +05:30
parent 03df844b9c
commit f7a65eb52c
4 changed files with 2 additions and 6 deletions

View File

@ -3,6 +3,7 @@
**latest**
- update postgresql client to the latest version, Closes #249
- removed `GITLAB_SIGNUP` configuration option, can be set from gitlab ui
- removed `GITLAB_SIGNIN` configuration option, can be set from gitlab ui
**7.7.2**
- gitlab-shell: upgrade to v.2.4.2

View File

@ -716,7 +716,6 @@ Below is the complete list of available options that can be used to customize yo
- **GITLAB_TIMEZONE**: Configure the timezone for the gitlab application. This configuration does not effect cron jobs. Defaults to `UTC`.
- **GITLAB_EMAIL**: The email address for the GitLab server. Defaults to `example@example.com`.
- **GITLAB_EMAIL_ENABLED**: Enable or disable gitlab mailer. Defaults to the `SMTP_ENABLED` configuration.
- **GITLAB_SIGNIN**: If set to `false`, standard login form won't be shown on the sign-in page. Default is `true`.
- **GITLAB_PROJECTS_LIMIT**: Set default projects limit. Defaults to `100`.
- **GITLAB_USERNAME_CHANGE**: Enable or disable ability for users to change their username. Defaults is `true`.
- **GITLAB_CREATE_GROUP**: Enable or disable ability for users to create groups. Defaults is `true`.

View File

@ -66,7 +66,7 @@ production: &base
## Standard login settings
# The standard login can be disabled to force login via LDAP
# default: true - If set to false the standard login form won't be shown on the sign-in page
signin_enabled: {{GITLAB_SIGNIN}}
# signin_enabled: false
# Restrict setting visibility levels for non-admin users.
# The default is to allow all levels.

View File

@ -20,7 +20,6 @@ GITLAB_SSH_PORT=${GITLAB_SSH_PORT:-22}
GITLAB_HTTPS=${GITLAB_HTTPS:-false}
GITLAB_EMAIL=${GITLAB_EMAIL:-example@example.com}
GITLAB_TIMEZONE=${GITLAB_TIMEZONE:-UTC}
GITLAB_SIGNIN=${GITLAB_SIGNIN:-true}
GITLAB_PROJECTS_LIMIT=${GITLAB_PROJECTS_LIMIT:-100}
GITLAB_USERNAME_CHANGE=${GITLAB_USERNAME_CHANGE:-true}
GITLAB_CREATE_GROUP=${GITLAB_CREATE_GROUP:-true}
@ -388,9 +387,6 @@ sudo -u git -H sed 's/{{GITLAB_SSH_PORT}}/'"${GITLAB_SSH_PORT}"'/' -i config/git
# configure default timezone
sudo -u git -H sed 's/{{GITLAB_TIMEZONE}}/'"${GITLAB_TIMEZONE}"'/' -i config/gitlab.yml
# configure gitlab signup configuration
sudo -u git -H sed 's/{{GITLAB_SIGNIN}}/'"${GITLAB_SIGNIN}"'/' -i config/gitlab.yml
# configure gitlab default_projects_limit
sudo -u git -H sed 's/{{GITLAB_PROJECTS_LIMIT}}/'"${GITLAB_PROJECTS_LIMIT}"'/' -i config/gitlab.yml