Merge branch 'update_database_config_syntax' into 'master'
Update syntax of database config (required before 14.x → 15.0 upgrade) See merge request ruby-team/gitlab!8
This commit is contained in:
commit
3948cf0a2a
1 changed files with 32 additions and 28 deletions
4
debian/conf/database.yml
vendored
4
debian/conf/database.yml
vendored
|
@ -2,6 +2,7 @@
|
||||||
# PRODUCTION
|
# PRODUCTION
|
||||||
#
|
#
|
||||||
production:
|
production:
|
||||||
|
main:
|
||||||
adapter: postgresql
|
adapter: postgresql
|
||||||
host: /var/run/postgresql
|
host: /var/run/postgresql
|
||||||
encoding: unicode
|
encoding: unicode
|
||||||
|
@ -16,6 +17,7 @@ production:
|
||||||
# Development specific
|
# Development specific
|
||||||
#
|
#
|
||||||
development:
|
development:
|
||||||
|
main:
|
||||||
adapter: postgresql
|
adapter: postgresql
|
||||||
encoding: unicode
|
encoding: unicode
|
||||||
database: gitlabhq_development
|
database: gitlabhq_development
|
||||||
|
@ -27,6 +29,7 @@ development:
|
||||||
# Staging specific
|
# Staging specific
|
||||||
#
|
#
|
||||||
staging:
|
staging:
|
||||||
|
main:
|
||||||
adapter: postgresql
|
adapter: postgresql
|
||||||
encoding: unicode
|
encoding: unicode
|
||||||
database: gitlabhq_staging
|
database: gitlabhq_staging
|
||||||
|
@ -38,6 +41,7 @@ staging:
|
||||||
# re-generated from your development database when you run "rake".
|
# re-generated from your development database when you run "rake".
|
||||||
# Do not set this db to the same as development or production.
|
# Do not set this db to the same as development or production.
|
||||||
test: &test
|
test: &test
|
||||||
|
main:
|
||||||
adapter: postgresql
|
adapter: postgresql
|
||||||
encoding: unicode
|
encoding: unicode
|
||||||
host: /var/run/postgresql
|
host: /var/run/postgresql
|
||||||
|
|
Loading…
Reference in a new issue