Merge branch 'next-minor' into develop

Changelog.md

@@ -16,6 +16,7 @@
 
 ## Refactor
 * Remove mention of deprecated `statistic.json` [#7867](https://github.com/diaspora/diaspora/pull/7867)
+* Add quotes in `database.yml.example` to fields that may contain special characters [#7875](https://github.com/diaspora/diaspora/pull/7875)
 
 ## Bug fixes
 * Add compatibility with macOS to `script/configure_bundler` [#7830](https://github.com/diaspora/diaspora/pull/7830)

config/database.yml.example

@@ -1,9 +1,9 @@
 postgresql: &postgresql
   adapter: postgresql
-  host: localhost
+  host: "localhost"
   port: 5432
-  username: postgres
-  password:
+  username: "postgres"
+  password: ""
   encoding: unicode
 
 mysql: &mysql