diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql index e558692d289dfbc03f5706575ec6375d259e120b..149acdb8daccad6346f13062ae0a778f27203d28 100644 --- a/config/database.yml.postgresql +++ b/config/database.yml.postgresql @@ -6,20 +6,13 @@ production: encoding: unicode database: gitlabhq_production pool: 10 -<<<<<<< HEAD - # username: git - # password: - # host: localhost - # port: 5432 + username: git + password: "secure password" + host: localhost # load_balancing: # hosts: # - host1.example.com # - host2.example.com -======= - username: git - password: "secure password" - host: localhost ->>>>>>> upstream/master # # Development specific