Merge branch 'database-confusion' into 'master'

Database Confusion

To prevent https://twitter.com/TechIsCool/status/426133762032676865
This commit is contained in:
Dmitriy Zaporozhets 2014-01-25 09:49:48 +00:00
commit 0955a45a53
2 changed files with 4 additions and 4 deletions

View file

@ -53,10 +53,10 @@ sudo -u git -H git checkout v1.8.0 # Addresses multiple critical security vulner
```bash
cd /home/git/gitlab
# MySQL
# MySQL installations (note: the line below states '--without ... postgres')
sudo -u git -H bundle install --without development test postgres --deployment
#PostgreSQL
# PostgreSQL installations (note: the line below states '--without ... mysql')
sudo -u git -H bundle install --without development test mysql --deployment

View file

@ -33,10 +33,10 @@ sudo -u git -H git checkout v1.8.0
```bash
cd /home/git/gitlab
# MySQL
# MySQL installations (note: the line below states '--without ... postgres')
sudo -u git -H bundle install --without development test postgres --deployment
# PostgreSQL
# PostgreSQL installations (note: the line below states '--without ... mysql')
sudo -u git -H bundle install --without development test mysql --deployment