Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
diaspora
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Gigadoc 2
diaspora
Commits
b508b9f6
Commit
b508b9f6
authored
Jan 15, 2017
by
Steffen van Bergerem
Committed by
Benjamin Neff
Jan 16, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update database config comments
closes #7282
parent
941118d7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
Changelog.md
Changelog.md
+1
-0
config/database.yml.example
config/database.yml.example
+2
-2
No files found.
Changelog.md
View file @
b508b9f6
...
...
@@ -4,6 +4,7 @@
## Bug fixes
*
Fix path to
`bundle`
in
`script/server`
[
#7281
](
https://github.com/diaspora/diaspora/pull/7281
)
*
Update comment in database example config
[
#7282
](
https://github.com/diaspora/diaspora/pull/7282
)
## Features
...
...
config/database.yml.example
View file @
b508b9f6
...
...
@@ -17,8 +17,8 @@ mysql: &mysql
collation: utf8mb4_bin
# Comment the
the mysql line and uncomment the postgres
line
# if you want to use
postgres
# Comment the
postgresql line and uncomment the mysql
line
# if you want to use
mysql
common: &common
# Choose one of the following
<<: *postgresql
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment