nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'next-minor' into develop

Browse source
This commit is contained in:
Dennis Schubert 2018-10-04 04:37:06 +02:00
commit 3ebe0e56a8
No known key found for this signature in database
GPG key ID: 5A0304BEA7966D7E
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -16,6 +16,7 @@
## Refactor ## Refactor
* Remove mention of deprecated `statistic.json` [#7867](https://github.com/diaspora/diaspora/pull/7867) * 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 ## Bug fixes
* Add compatibility with macOS to `script/configure_bundler` [#7830](https://github.com/diaspora/diaspora/pull/7830) * Add compatibility with macOS to `script/configure_bundler` [#7830](https://github.com/diaspora/diaspora/pull/7830)

6
config/database.yml.example
View file

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